#700380 by mitchmac, Dave Reid, mfb, Ryan Palmer, justinrandell: Fix sorting in tableselect if #weight is not set.

1 files changed, 6 insertions, 5 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 2610c9902..235d560b7 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2932,12 +2932,12 @@ function theme_tableselect($variables) {
   $header = $element['#header'];
   if (!empty($element['#options'])) {
     // Generate a table row for each selectable item in #options.
-    foreach ($element['#options'] as $key => $value) {
+    foreach (element_children($element) as $key) {
       $row = array();
 
       $row['data'] = array();
-      if (isset($value['#attributes'])) {
-        $row += $value['#attributes'];
+      if (isset($element['#options'][$key]['#attributes'])) {
+        $row += $element['#options'][$key]['#attributes'];
       }
       // Render the checkbox / radio element.
       $row['data'][] = drupal_render($element[$key]);
@@ -2991,8 +2991,6 @@ function form_process_tableselect($element) {
       $element['#default_value'] = array();
     }
 
-    // Sort the options by their #weight if they have a #weight.
-    uasort($element['#options'], 'element_sort');
     // Create a checkbox or radio for each item in #options in such a way that
     // the value of the tableselect element behaves as if it had been of type
     // checkboxes or radios.
@@ -3023,6 +3021,9 @@ function form_process_tableselect($element) {
             '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
           );
         }
+        if (isset($element['#options'][$key]['#weight'])) {
+          $element[$key]['#weight'] = $element['#options'][$key]['#weight'];
+        }
       }
     }
   }