Index: common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1199
diff -u -p -r1.1199 common.inc
--- common.inc	3 Aug 2010 02:14:50 -0000	1.1199
+++ common.inc	3 Aug 2010 14:49:39 -0000
@@ -5415,8 +5415,10 @@ function drupal_render_cid_create($eleme
  * Function used by uasort to sort structured arrays by weight.
  */
 function element_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;
+  $a = (array)$a;
+  $b = (array)$b;
+  $a_weight = isset($a['#weight']) ? $a['#weight'] : 0;
+  $b_weight = isset($b['#weight']) ? $b['#weight'] : 0;
   if ($a_weight == $b_weight) {
     return 0;
   }