From 0f80b09a4a0aa268279efe24bdb7be57f934da36 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 5 Dec 2005 21:21:49 +0000
Subject: - Patch #39875 by chx: make form sorting work with PHP5.

---
 includes/form.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'includes')

diff --git a/includes/form.inc b/includes/form.inc
index 65c944921..a11d95692 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -358,10 +358,12 @@ function form_render(&$elements) {
  * Function used by uasort in form render to sort form via weight.
  */
 function _form_sort($a, $b) {
-  if ($a['#weight'] == $b['#weight']) {
+  $a_weight = (is_array($a) && isset($a['#weight'])) ? $a['#weight'] : 0;
+  $b_weight = (is_array($b) && isset($b['#weight'])) ? $b['#weight'] : 0;
+  if ($a_weight == $b_weight) {
     return 0;
   }
-  return ($a['#weight'] < $b['#weight']) ? -1 : 1;
+  return ($a_weight < $b_weight) ? -1 : 1;
 }
 
 /**
-- 
cgit v1.2.3