summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-01-21 11:00:42 -0800
committerwebchick <webchick@24967.no-reply.drupal.org>2012-01-21 11:00:42 -0800
commit6972dd4615f7e353f757dd04c4a55673cfad29d0 (patch)
tree25340fc5724083fa572e756727d423434897093f /includes
parent8164434505e4292e5d584eebbf7b05b403d9c07b (diff)
downloadbrdo-6972dd4615f7e353f757dd04c4a55673cfad29d0.tar.gz
brdo-6972dd4615f7e353f757dd04c4a55673cfad29d0.tar.bz2
Issue #1402962 by xjm, marcingy, oriol_e9g, msonnabaum: Fixed Render cache shouldn't treat empty strings as a cache miss.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index f8e40a961..3e79239f5 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5679,8 +5679,11 @@ function drupal_render(&$elements) {
}
// Try to fetch the element's markup from cache and return.
- if (isset($elements['#cache']) && $cached_output = drupal_render_cache_get($elements)) {
- return $cached_output;
+ if (isset($elements['#cache'])) {
+ $cached_output = drupal_render_cache_get($elements);
+ if ($cached_output !== FALSE) {
+ return $cached_output;
+ }
}
// If #markup is set, ensure #type is set. This allows to specify just #markup