Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#84188 by plumbley, pwolanin, and nickl. Fix some PHP notices.

5.x
Neil Drumm 2006-10-17 08:42:24 +00:00
parent a13d829c33
commit b87692a901
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/common.inc
View File

@ -1773,10 +1773,10 @@ function drupal_render(&$elements) {
if (!isset($elements['#children'])) { if (!isset($elements['#children'])) {
$children = element_children($elements); $children = element_children($elements);
/* Render all the children that use a theme function */ /* Render all the children that use a theme function */
if (isset($elements['#theme']) && !$elements['#theme_used']) { if (isset($elements['#theme']) && empty($elements['#theme_used'])) {
$elements['#theme_used'] = TRUE; $elements['#theme_used'] = TRUE;
$previous_value = $elements['#value']; $previous_value = isset($elements['#value']) ? $elements['#value'] : NULL;
$previous_type = $elements['#type']; $previous_type = $elements['#type'];
// If we rendered a single element, then we will skip the renderer. // If we rendered a single element, then we will skip the renderer.
if (empty($children)) { if (empty($children)) {
@ -1806,7 +1806,7 @@ function drupal_render(&$elements) {
// Until now, we rendered the children, here we render the element itself // Until now, we rendered the children, here we render the element itself
if (!isset($elements['#printed'])) { if (!isset($elements['#printed'])) {
$content = theme(($elements['#type']) ? $elements['#type']: 'markup', $elements); $content = theme(!empty($elements['#type']) ? $elements['#type'] : 'markup', $elements);
$elements['#printed'] = TRUE; $elements['#printed'] = TRUE;
} }