Index: index.php
===================================================================
RCS file: /cvs/drupal/drupal/index.php,v
retrieving revision 1.91
diff -u -p -r1.91 index.php
--- index.php	12 Dec 2006 09:32:18 -0000	1.91
+++ index.php	27 Jan 2007 02:05:04 -0000
@@ -34,4 +34,4 @@ elseif (isset($return)) {
 
 }
 
-drupal_page_footer();
\ No newline at end of file
+drupal_page_footer();
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.613
diff -u -p -r1.613 common.inc
--- includes/common.inc	24 Jan 2007 14:48:35 -0000	1.613
+++ includes/common.inc	27 Jan 2007 02:05:05 -0000
@@ -1450,6 +1450,8 @@ function drupal_get_css($css = NULL) {
   if (!isset($css)) {
     $css = drupal_add_css();
   }
+  $no_module_preprocess = '';
+  $no_theme_preprocess = '';
 
   $preprocess_css = variable_get('preprocess_css', FALSE);
   $directory = file_directory_path();
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.149
diff -u -p -r1.149 menu.inc
--- includes/menu.inc	25 Jan 2007 22:14:06 -0000	1.149
+++ includes/menu.inc	27 Jan 2007 02:05:05 -0000
@@ -356,7 +356,7 @@ function _menu_tree($result = NULL, $dep
       list($remnant, $menu) = _menu_tree($result, $item->depth, $menu_link);
       $tree .= theme('menu_tree', $link, $menu);
       $link = $remnant;
-      $remnant = '';
+      $remnant = array('link' => '', 'has_children' => FALSE);
     }
     elseif ($item->depth == $depth) {
       $tree .= theme('menu_link', $link);
@@ -496,6 +496,7 @@ function menu_rebuild() {
       '_has_children' => 0,
       'title' => '',
       'weight' => 0,
+      'type' => MENU_NORMAL_ITEM,
     );
     $sort[$path] = ($item['_visible'] ? $depth : $number_parts) . sprintf('%05d', $item['weight']) . $item['title'];
     unset($item);
@@ -527,11 +528,6 @@ function menu_rebuild() {
     if (!isset($item['map callback']) && isset($item['map arguments'])) {
       $item['map callback'] = 'menu_map';
     }
-    foreach (array('access', 'map', 'page') as $type) {
-      if (isset($item["$type callback"]) && !isset($item["$type arguments"])) {
-        $item["$type arguments"] = array();
-      }
-    }
     if (is_bool($item['access callback'])) {
       $item['access callback'] = intval($item['access callback']);
     }
@@ -548,7 +544,16 @@ function menu_rebuild() {
       $vancode = '';
       $link = '';
     }
-    db_query("INSERT INTO {menu} (mid, pid, path, access_callback, access_arguments, page_callback, page_arguments, map_callback, map_arguments, fit, number_parts, vancode, menu_link, visible, parents, depth, has_children) VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, '%s', %d, %d)", $item['_mid'], $item['_pid'], $path, $item['access callback'], serialize($item['access arguments']), $item['page callback'], serialize($item['page arguments']), $item['map callback'], serialize($item['map arguments']), $item['_fit'], $item['_number_parts'], $vancode .'+', $link, $item['_visible'], $item['_parents'], $item['_depth'], $item['_has_children']);
+    $tab = ($item['type'] & MENU_IS_LOCAL_TASK) ? 1 : 0;
+    $insert_item = $item + array(
+      'access arguments' => array(),
+      'access callback' => '',
+      'page arguments' => array(),
+      'page callback' => '',
+      'map arguments' => array(),
+      'map callback' => '',
+    );
+    db_query("INSERT INTO {menu} (mid, pid, path, access_callback, access_arguments, page_callback, page_arguments, map_callback, map_arguments, fit, number_parts, vancode, menu_link, visible, parents, depth, has_children) VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, '%s', %d, %d)", $insert_item['_mid'], $insert_item['_pid'], $path, $insert_item['access callback'], serialize($insert_item['access arguments']), $insert_item['page callback'], serialize($insert_item['page arguments']), $insert_item['map callback'], serialize($insert_item['map arguments']), $insert_item['_fit'], $insert_item['_number_parts'], $vancode .'+', $link, $insert_item['_visible'], $insert_item['_parents'], $insert_item['_depth'], $insert_item['_has_children']);
     // $item needs to be unset because of the reference above.
     unset($item);
   }
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.445
diff -u -p -r1.445 system.module
--- modules/system/system.module	25 Jan 2007 22:14:06 -0000	1.445
+++ modules/system/system.module	27 Jan 2007 02:05:07 -0000
@@ -1244,6 +1244,11 @@ function system_modules($form_values = N
   $disabled = array();
   // Traverse the files retrieved and build the form.
   foreach ($files as $filename => $file) {
+    $file->info += array(
+      'dependents' => array(),
+      'version' => NULL,
+      'throttle' => NULL,
+    );
     $form['name'][$filename] = array('#value' => $file->info['name']);
     $form['version'][$filename] = array('#value' => $file->info['version']);
     $form['description'][$filename] = array('#value' => t($file->info['description']));
@@ -1286,16 +1291,14 @@ function system_modules($form_values = N
 
     // Mark dependents disabled so user can not remove modules being depended on.
     $dependents = array();
-    if (is_array($file->info['dependents'])) {
-      foreach ($file->info['dependents'] as $dependent) {
-        if ($files[$dependent]->status == 1) {
-          $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-enabled">enabled</span>)');
-          $disabled[] = $filename;
-          $form['disabled_modules']['#value'][$filename] = TRUE;
-        }
-        else {
-          $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-disabled">disabled</span>)');
-        }
+    foreach ($file->info['dependents'] as $dependent) {
+      if ($files[$dependent]->status == 1) {
+        $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-enabled">enabled</span>)');
+        $disabled[] = $filename;
+        $form['disabled_modules']['#value'][$filename] = TRUE;
+      }
+      else {
+        $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-disabled">disabled</span>)');
       }
     }
 
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.748
diff -u -p -r1.748 user.module
--- modules/user/user.module	25 Jan 2007 22:14:06 -0000	1.748
+++ modules/user/user.module	27 Jan 2007 02:05:08 -0000
@@ -908,7 +908,8 @@ function user_menu() {
     'type' => MENU_LOCAL_TASK,
   );
 
-  if (($categories = _user_categories($account)) && (count($categories) > 1)) {
+  $empty_account = new stdClass();
+  if (($categories = _user_categories($empty_account)) && (count($categories) > 1)) {
     foreach ($categories as $key => $category) {
       $items['user/%/edit/'. $category['name']] = array(
         'title' => $category['title'],