summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-16 20:31:27 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-16 20:31:27 +0000
commitf39f02ce7573d2e1221e985a787edf5d35c69358 (patch)
tree4c1712aabce6466ac90dc50ca42251da2bf9a37c /includes
parent796bb8543bb7ae6df3b2ed224b63be874f3e5c8c (diff)
downloadbrdo-f39f02ce7573d2e1221e985a787edf5d35c69358.tar.gz
brdo-f39f02ce7573d2e1221e985a787edf5d35c69358.tar.bz2
#601806 follow-up by sun and effulgentsia: Fix broken HEAD.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 7e26ad4c7..197124868 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5131,7 +5131,9 @@ function drupal_render_cache_get($elements) {
if (!empty($cid) && $cache = cache_get($cid, $bin)) {
// Add additional libraries, JavaScript, CSS and other data attached
// to this element.
- drupal_process_attached($cache->data);
+ if (isset($cache->data['#attached'])) {
+ drupal_process_attached($cache->data);
+ }
// Return the rendered output.
return $cache->data['#markup'];;
}