summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-04-10 23:38:58 +0200
committerDries Buytaert <dries@buytaert.net>2011-04-10 23:38:58 +0200
commit0d05031835c269ff76600ffe30cd24340ecffcf0 (patch)
treea781f354169a5215cccbb11fcf2133ad30294249 /includes
parent37f60420d1f0eb6c1a6bd81363aae46887bfe1cc (diff)
downloadbrdo-0d05031835c269ff76600ffe30cd24340ecffcf0.tar.gz
brdo-0d05031835c269ff76600ffe30cd24340ecffcf0.tar.bz2
- Patch #998612 by longwave: drupal_render() doesn't render 0 when set into #markup property.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 5f56d4413..814ca549a 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5568,9 +5568,9 @@ function drupal_render(&$elements) {
return $cached_output;
}
- // If #markup is not empty, set #type. This allows to specify just #markup on
- // an element without setting #type.
- if (!empty($elements['#markup']) && !isset($elements['#type'])) {
+ // If #markup is set, ensure #type is set. This allows to specify just #markup
+ // on an element without setting #type.
+ if (isset($elements['#markup']) && !isset($elements['#type'])) {
$elements['#type'] = 'markup';
}