Commit b87692a9 authored by drumm's avatar drumm
Browse files

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

parent a13d829c
......@@ -1773,10 +1773,10 @@ function drupal_render(&$elements) {
if (!isset($elements['#children'])) {
$children = element_children($elements);
/* 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;
$previous_value = $elements['#value'];
$previous_value = isset($elements['#value']) ? $elements['#value'] : NULL;
$previous_type = $elements['#type'];
// If we rendered a single element, then we will skip the renderer.
if (empty($children)) {
......@@ -1806,7 +1806,7 @@ function drupal_render(&$elements) {
// Until now, we rendered the children, here we render the element itself
if (!isset($elements['#printed'])) {
$content = theme(($elements['#type']) ? $elements['#type']: 'markup', $elements);
$content = theme(!empty($elements['#type']) ? $elements['#type'] : 'markup', $elements);
$elements['#printed'] = TRUE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment