? .DS_Store
? 362889-common-theme.patch
? die__taxonomy_term_select_die_00.patch
? die__taxonomy_term_select_die_01.patch
? die__taxonomy_term_select_die_02.patch
? dont_require_perm_descriptions_00.patch
? drupal_common_theme_02.patch
? taxonomy_widgets_04.patch
? sites/.DS_Store
? sites/default/.DS_Store
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1016
diff -u -p -r1.1016 common.inc
--- includes/common.inc	13 Oct 2009 16:38:42 -0000	1.1016
+++ includes/common.inc	14 Oct 2009 18:33:09 -0000
@@ -4823,197 +4823,6 @@ function element_children(&$elements, $s
 }
 
 /**
- * Provide theme registration for themes across .inc files.
- */
-function drupal_common_theme() {
-  return array(
-    // theme.inc
-    'placeholder' => array(
-      'arguments' => array('text' => NULL)
-    ),
-    'html' => array(
-      'arguments' => array('page' => NULL),
-      'template' => 'html',
-    ),
-    'page' => array(
-      'arguments' => array('page' => NULL),
-      'template' => 'page',
-    ),
-    'maintenance_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
-      'template' => 'maintenance-page',
-    ),
-    'update_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
-    ),
-    'install_page' => array(
-      'arguments' => array('content' => NULL),
-    ),
-    'region' => array(
-      'arguments' => array('elements' => NULL),
-      'template' => 'region',
-    ),
-    'task_list' => array(
-      'arguments' => array('items' => NULL, 'active' => NULL),
-    ),
-    'status_messages' => array(
-      'arguments' => array('display' => NULL),
-    ),
-    'links' => array(
-      'arguments' => array('links' => NULL, 'attributes' => array('class' => array('links')), 'heading' => array()),
-    ),
-    'image' => array(
-      'arguments' => array('path' => NULL, 'alt' => '', 'title' => '', 'attributes' => array(), 'getsize' => TRUE),
-    ),
-    'breadcrumb' => array(
-      'arguments' => array('breadcrumb' => NULL),
-    ),
-    'help' => array(
-      'arguments' => array(),
-    ),
-    'submenu' => array(
-      'arguments' => array('links' => NULL),
-    ),
-    'table' => array(
-      'arguments' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => TRUE),
-    ),
-    'table_select_header_cell' => array(
-      'arguments' => array(),
-    ),
-    'tablesort_indicator' => array(
-      'arguments' => array('style' => NULL),
-    ),
-    'mark' => array(
-      'arguments' => array('type' => MARK_NEW),
-    ),
-    'item_list' => array(
-      'arguments' => array('items' => array(), 'title' => NULL, 'type' => 'ul', 'attributes' => array()),
-    ),
-    'more_help_link' => array(
-      'arguments' => array('url' => NULL),
-    ),
-    'feed_icon' => array(
-      'arguments' => array('url' => NULL, 'title' => NULL),
-    ),
-    'more_link' => array(
-      'arguments' => array('url' => NULL, 'title' => NULL)
-    ),
-    'blocks' => array(
-      'arguments' => array('region' => NULL),
-    ),
-    'username' => array(
-      'arguments' => array('account' => NULL),
-    ),
-    'progress_bar' => array(
-      'arguments' => array('percent' => NULL, 'message' => NULL),
-    ),
-    'indentation' => array(
-      'arguments' => array('size' => 1),
-    ),
-    // from pager.inc
-    'pager' => array(
-      'arguments' => array('tags' => array(), 'element' => 0, 'parameters' => array(), 'quantity' => 9),
-    ),
-    'pager_first' => array(
-      'arguments' => array('text' => NULL, 'element' => 0, 'parameters' => array()),
-    ),
-    'pager_previous' => array(
-      'arguments' => array('text' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
-    ),
-    'pager_next' => array(
-      'arguments' => array('text' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
-    ),
-    'pager_last' => array(
-      'arguments' => array('text' => NULL, 'element' => 0, 'parameters' => array()),
-    ),
-    'pager_link' => array(
-      'arguments' => array('text' => NULL, 'page_new' => NULL, 'element' => NULL, 'parameters' => array(), 'attributes' => array()),
-    ),
-    // from locale.inc
-    'locale_admin_manage_screen' => array(
-      'arguments' => array('form' => NULL),
-    ),
-    // from menu.inc
-    'menu_link' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'menu_tree' => array(
-      'arguments' => array('tree' => NULL),
-    ),
-    'menu_local_task' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'menu_local_action' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'menu_local_tasks' => array(
-      'arguments' => array(),
-    ),
-    // from form.inc
-    'select' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'fieldset' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'radio' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'radios' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'date' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'checkbox' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'checkboxes' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'button' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'image_button' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'hidden' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'textfield' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'form' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'textarea' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'markup' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'password' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'file' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'tableselect' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'form_element' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'text_format_wrapper' => array(
-      'arguments' => array('element' => NULL),
-    ),
-    'vertical_tabs' => array(
-      'arguments' => array('element' => NULL),
-    ),
-  );
-}
-
-/**
  * @ingroup schemaapi
  * @{
  */
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.808
diff -u -p -r1.808 system.module
--- modules/system/system.module	13 Oct 2009 16:38:43 -0000	1.808
+++ modules/system/system.module	14 Oct 2009 18:33:10 -0000
@@ -154,7 +154,187 @@ function system_help($path, $arg) {
  * Implement hook_theme().
  */
 function system_theme() {
-  return array_merge(drupal_common_theme(), array(
+  return array(
+    // From theme.inc.
+    'placeholder' => array(
+      'arguments' => array('text' => NULL)
+    ),
+    'page' => array(
+      'arguments' => array('page' => NULL),
+      'template' => 'page',
+    ),
+    'maintenance_page' => array(
+      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+      'template' => 'maintenance-page',
+      'path' => 'includes',
+      'file' => 'theme.maintenance.inc',
+    ),
+    'update_page' => array(
+      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+    ),
+    'install_page' => array(
+      'arguments' => array('content' => NULL),
+    ),
+    'task_list' => array(
+      'arguments' => array('items' => NULL, 'active' => NULL),
+    ),
+    'status_messages' => array(
+      'arguments' => array('display' => NULL),
+    ),
+    'links' => array(
+      'arguments' => array('links' => NULL, 'attributes' => array('class' => array('links')), 'heading' => array()),
+    ),
+    'image' => array(
+      'arguments' => array('path' => NULL, 'alt' => '', 'title' => '', 'attributes' => array(), 'getsize' => TRUE),
+    ),
+    'breadcrumb' => array(
+      'arguments' => array('breadcrumb' => NULL),
+    ),
+    'help' => array(
+      'arguments' => array(),
+    ),
+    'submenu' => array(
+      'arguments' => array('links' => NULL),
+    ),
+    'table' => array(
+      'arguments' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => TRUE),
+    ),
+    'table_select_header_cell' => array(
+      'arguments' => array(),
+    ),
+    'tablesort_indicator' => array(
+      'arguments' => array('style' => NULL),
+    ),
+    'mark' => array(
+      'arguments' => array('type' => MARK_NEW),
+    ),
+    'item_list' => array(
+      'arguments' => array('items' => array(), 'title' => NULL, 'type' => 'ul', 'attributes' => array()),
+    ),
+    'more_help_link' => array(
+      'arguments' => array('url' => NULL),
+    ),
+    'feed_icon' => array(
+      'arguments' => array('url' => NULL, 'title' => NULL),
+    ),
+    'more_link' => array(
+      'arguments' => array('url' => NULL, 'title' => NULL)
+    ),
+    'blocks' => array(
+      'arguments' => array('region' => NULL),
+    ),
+    'username' => array(
+      'arguments' => array('object' => NULL),
+    ),
+    'progress_bar' => array(
+      'arguments' => array('percent' => NULL, 'message' => NULL),
+    ),
+    'indentation' => array(
+      'arguments' => array('size' => 1),
+    ),
+    // From pager.inc.
+    'pager' => array(
+      'arguments' => array('tags' => array(), 'element' => 0, 'parameters' => array(), 'quantity' => 9),
+    ),
+    'pager_first' => array(
+      'arguments' => array('text' => NULL, 'element' => 0, 'parameters' => array()),
+    ),
+    'pager_previous' => array(
+      'arguments' => array('text' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
+    ),
+    'pager_next' => array(
+      'arguments' => array('text' => NULL, 'element' => 0, 'interval' => 1, 'parameters' => array()),
+    ),
+    'pager_last' => array(
+      'arguments' => array('text' => NULL, 'element' => 0, 'parameters' => array()),
+    ),
+    'pager_link' => array(
+      'arguments' => array('text' => NULL, 'page_new' => NULL, 'element' => NULL, 'parameters' => array(), 'attributes' => array()),
+    ),
+    // From locale.inc.
+    'locale_admin_manage_screen' => array(
+      'arguments' => array('form' => NULL),
+    ),
+    // From menu.inc.
+    'menu_item_link' => array(
+      'arguments' => array('item' => NULL),
+    ),
+    'menu_tree' => array(
+      'arguments' => array('tree' => NULL),
+    ),
+    'menu_item' => array(
+      'arguments' => array('link' => NULL, 'has_children' => NULL, 'menu' => ''),
+    ),
+    'menu_local_task' => array(
+      'arguments' => array('link' => NULL, 'active' => FALSE),
+    ),
+    'menu_local_action' => array(
+      'arguments' => array('link' => NULL),
+    ),
+    'menu_local_tasks' => array(
+      'arguments' => array(),
+    ),
+    // From form.inc.
+    'select' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'fieldset' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'radio' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'radios' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'date' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'checkbox' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'checkboxes' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'button' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'image_button' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'hidden' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'textfield' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'form' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'textarea' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'markup' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'password' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'file' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'tableselect' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'form_element' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'text_format_wrapper' => array(
+      'arguments' => array('element' => NULL),
+    ),
+    'vertical_tabs' => array(
+      'arguments' => array('element' => NULL),
+    ),
     'system_themes_form' => array(
       'arguments' => array('form' => NULL),
       'file' => 'system.admin.inc',
@@ -204,7 +384,7 @@ function system_theme() {
     'system_run_cron_image' => array(
       'arguments' => array('image_path' => NULL),
     ),
-  ));
+  );
 }
 
 /**