? sites/all/modules/contrib
? sites/default/files
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1212
diff -u -p -r1.1212 common.inc
--- includes/common.inc	1 Sep 2010 20:08:17 -0000	1.1212
+++ includes/common.inc	2 Sep 2010 07:01:12 -0000
@@ -5445,9 +5445,9 @@ 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;
+function element_sort(array $a, 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;
   }
@@ -5480,9 +5480,9 @@ function element_info($type) {
 /**
  * Function used by uasort to sort structured arrays by weight, without the property weight prefix.
  */
-function drupal_sort_weight($a, $b) {
-  $a_weight = (is_array($a) && isset($a['weight'])) ? $a['weight'] : 0;
-  $b_weight = (is_array($b) && isset($b['weight'])) ? $b['weight'] : 0;
+function drupal_sort_weight(array $a, 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;
   }
@@ -5492,21 +5492,21 @@ function drupal_sort_weight($a, $b) {
 /**
  * Check if the key is a property.
  */
-function element_property($key) {
+function element_property(array $key) {
   return $key[0] == '#';
 }
 
 /**
  * Get properties of a structured array element. Properties begin with '#'.
  */
-function element_properties($element) {
-  return array_filter(array_keys((array) $element), 'element_property');
+function element_properties(array $element) {
+  return array_filter(array_keys($element), 'element_property');
 }
 
 /**
  * Check if the key is a child.
  */
-function element_child($key) {
+function element_child(array $key) {
   return !isset($key[0]) || $key[0] != '#';
 }
 
@@ -5520,7 +5520,7 @@ function element_child($key) {
  * @return
  *   The array keys of the element's children.
  */
-function element_children(&$elements, $sort = FALSE) {
+function element_children(array &$elements, $sort = FALSE) {
   // Do not attempt to sort elements which have already been sorted.
   $sort = isset($elements['#sorted']) ? !$elements['#sorted'] : $sort;
 
@@ -5530,7 +5530,7 @@ function element_children(&$elements, $s
   foreach ($elements as $key => $value) {
     if ($key[0] !== '#') {
       $children[$key] = $value;
-      if (is_array($value) && isset($value['#weight'])) {
+      if (isset($value['#weight'])) {
         $sortable = TRUE;
       }
     }
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.43
diff -u -p -r1.43 toolbar.module
--- modules/toolbar/toolbar.module	2 Jul 2010 02:22:26 -0000	1.43
+++ modules/toolbar/toolbar.module	2 Sep 2010 07:01:13 -0000
@@ -269,7 +269,7 @@ function toolbar_view() {
   if(_toolbar_is_collapsed()) {
     $toolbar_drawer_classes[] = 'collapsed';
   }
-  $build['toolbar_drawer_classes'] = implode(' ', $toolbar_drawer_classes);
+  $build['#toolbar_drawer_classes'] = implode(' ', $toolbar_drawer_classes);
 
   return $build;
 }
Index: modules/toolbar/toolbar.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.tpl.php,v
retrieving revision 1.11
diff -u -p -r1.11 toolbar.tpl.php
--- modules/toolbar/toolbar.tpl.php	23 May 2010 18:23:32 -0000	1.11
+++ modules/toolbar/toolbar.tpl.php	2 Sep 2010 07:01:13 -0000
@@ -32,7 +32,7 @@
     <?php endif; ?>
   </div>
 
-  <div class="<?php echo $toolbar['toolbar_drawer_classes']; ?>">
+  <div class="<?php echo $toolbar['#toolbar_drawer_classes']; ?>">
     <?php print render($toolbar['toolbar_drawer']); ?>
   </div>
 </div>