summaryrefslogtreecommitdiffstats
path: root/core/includes
diff options
context:
space:
mode:
Diffstat (limited to 'core/includes')
-rw-r--r--core/includes/common.inc35
-rw-r--r--core/includes/theme.inc10
2 files changed, 17 insertions, 28 deletions
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 8a8ea0e..711d8d3 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -4683,32 +4683,25 @@ function drupal_render(&$elements) {
// element have to be rendered there. If the internal #render_children
// property is set, do not call the #theme function to prevent infinite
// recursion.
- $theme_is_implemented = FALSE;
if (isset($elements['#theme']) && !isset($elements['#render_children'])) {
$elements['#children'] = theme($elements['#theme'], $elements);
- // If theme() returns FALSE this means that the hook in #theme was not found
- // in the registry. This is common for theme suggestions.
- $theme_is_implemented = ($elements['#children'] !== FALSE);
- }
- // #theme is either not set or does not exist in the registry.
- if (!$theme_is_implemented) {
- // If #theme is not implemented and the element has children, render them
- // now. This is the same process as drupal_render_children() but is inlined
- // for speed.
+ }
+ // If #theme was not set and the element has children, render them now.
+ // This is the same process as drupal_render_children() but is inlined
+ // for speed.
+ if ($elements['#children'] === '') {
foreach ($children as $key) {
$elements['#children'] .= drupal_render($elements[$key]);
}
-
- // If #theme is not implemented and the element has raw #markup as a
- // fallback, prepend the content in #markup to #children. In this case
- // #children will contain whatever is provided by #pre_render prepended to
- // what is rendered recursively above. If #theme is implemented then it is
- // the responsibility of that theme implementation to render #markup if
- // required. Eventually #theme_wrappers will expect both #markup and
- // #children to be a single string as #children.
- if (isset($elements['#markup'])) {
- $elements['#children'] = $elements['#markup'] . $elements['#children'];
- }
+ }
+ // If #theme was not set, but the element has raw #markup, prepend the content
+ // in #markup to #children. #children may contain the rendered content
+ // supplied by #theme, or the rendered child elements, as processed above. If
+ // both #theme and #markup are set, then #theme is responsible for rendering
+ // the element. Eventually assigned #theme_wrappers will expect both the
+ // element's #markup and the rendered content of child elements in #children.
+ if (!isset($elements['#theme']) && isset($elements['#markup'])) {
+ $elements['#children'] = $elements['#markup'] . $elements['#children'];
}
// Add any JavaScript state information associated with the element.
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index df03ad6..45737c5 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -932,9 +932,8 @@ function drupal_find_base_themes($themes, $key, $used_keys = array()) {
* properties are mapped to variables expected by the theme hook
* implementations.
*
- * @return string|false
- * An HTML string representing the themed output or FALSE if the passed $hook
- * is not implemented.
+ * @return
+ * An HTML string representing the themed output.
*
* @see themeable
* @see hook_theme()
@@ -983,10 +982,7 @@ function theme($hook, $variables = array()) {
if (!isset($candidate)) {
watchdog('theme', 'Theme hook %hook not found.', array('%hook' => $hook), WATCHDOG_WARNING);
}
- // There is no theme implementation for the hook passed. Return FALSE so
- // the function calling theme() can differentiate between a hook that
- // exists and renders an empty string and a hook that is not implemented.
- return FALSE;
+ return '';
}
}