From 7ef324ec847a2d7987b67ce7d0f72c47bd166a12 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 5 Dec 2005 09:48:54 +0000
Subject: [PATCH] - Unrolled chx's form sort patch.
---
includes/form.inc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/includes/form.inc b/includes/form.inc
index ec4183742628..65c944921049 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -19,7 +19,7 @@
* Check if the key is a property.
*/
function element_property($key) {
- return $key[0] == '#';
+ return $key{0} == '#';
}
function element_properties($element) {
@@ -30,7 +30,7 @@ function element_properties($element) {
* Check if the key is a child.
*/
function element_child($key) {
- return $key[0] != '#';
+ return $key{0} != '#';
}
function element_children($element) {
@@ -358,9 +358,10 @@ function form_render(&$elements) {
* Function used by uasort in form render to sort form via weight.
*/
function _form_sort($a, $b) {
- $a_weight = (is_array($a) && isset($a['#weight'])) ? $a['#weight'] : 0;
- $b_weight = (is_array($b) && isset($b['#weight'])) ? $b['#weight'] : 0;
- return $a_weight - $b_weight;
+ if ($a['#weight'] == $b['#weight']) {
+ return 0;
+ }
+ return ($a['#weight'] < $b['#weight']) ? -1 : 1;
}
/**
--
GitLab