summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index b55384e2a..acd66a789 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2113,7 +2113,11 @@ function drupal_render(&$elements) {
}
$content = '';
- uasort($elements, "_element_sort");
+ // Either the elements did not go through form_builder or one of the children
+ // has a #weight.
+ if (!isset($elements['#sorted'])) {
+ uasort($elements, "_element_sort");
+ }
if (!isset($elements['#children'])) {
$children = element_children($elements);
/* Render all the children that use a theme function */