Index: index.php
===================================================================
RCS file: /cvs/drupal/drupal/index.php,v
retrieving revision 1.88
diff -u -r1.88 index.php
--- index.php	8 Oct 2005 12:38:20 -0000	1.88
+++ index.php	17 Nov 2005 14:41:42 -0000
@@ -12,23 +12,7 @@
 require_once './includes/bootstrap.inc';
 drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
 
-$return = menu_execute_active_handler();
-switch ($return) {
-  case MENU_NOT_FOUND:
-    drupal_not_found();
-    break;
-  case MENU_ACCESS_DENIED:
-    drupal_access_denied();
-    break;
-  case MENU_SITE_OFFLINE:
-    drupal_site_offline();
-    break;
-  default:
-    if (!empty($return)) {
-      print theme('page', $return);
-    }
-    break;
-}
+menu_print_active_handler();
 
 drupal_page_footer();
 
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.89
diff -u -r1.89 menu.inc
--- includes/menu.inc	3 Nov 2005 19:33:37 -0000	1.89
+++ includes/menu.inc	17 Nov 2005 14:41:42 -0000
@@ -360,6 +360,29 @@
 }
 
 /**
+ * Execute the handler associated with the active menu item.
+ */
+function menu_print_active_handler() {
+  $return = menu_execute_active_handler();
+  switch ($return) {
+    case MENU_NOT_FOUND:
+      drupal_not_found();
+      break;
+    case MENU_ACCESS_DENIED:
+      drupal_access_denied();
+      break;
+    case MENU_SITE_OFFLINE:
+      drupal_site_offline();
+      break;
+    default:
+      if (!empty($return)) {
+        print theme('page', $return);
+      }
+      break;
+  }
+}
+
+/**
  * Returns the ID of the active menu item.
  */
 function menu_get_active_item() {
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.255
diff -u -r1.255 system.module
--- modules/system.module	14 Nov 2005 22:19:14 -0000	1.255
+++ modules/system.module	17 Nov 2005 14:40:31 -0000
@@ -103,7 +103,7 @@
 
     $items[] = array('path' => 'admin', 'title' => t('administer'),
       'access' => user_access('access administration pages'),
-      'callback' => 'watchdog_overview',
+      'callback' => '_system_adminpage',
       'weight' => 9);
 
     // Themes:
@@ -223,6 +223,11 @@
   return $zones;
 }
 
+function _system_adminpage () {
+  menu_set_active_item(variable_get('site_adminpage', 'admin/logs'));
+  menu_print_active_handler();
+}
+
 function system_view_general() {
   // General settings:
   $form['general'] = array(
@@ -258,6 +263,10 @@
     '#type' => 'textfield', '#title' => t('Default front page'), '#default_value' => variable_get('site_frontpage', 'node'),
     '#description' => t('The home page displays content from this relative URL.  If you are not using clean URLs, specify the part after "?q=".  If unsure, specify "node".')
   );
+  $form['general']['site_adminpage'] = array(
+    '#type' => 'textfield', '#title' => t('Default admin front page'), '#default_value' => variable_get('site_adminpage', 'admin/logs'),
+    '#description' => t('The admin home page displays content from this relative URL.  If you are not using clean URLs, specify the part after "?q=".  If unsure, specify "admin/logs".')
+  );
 
   // We check for clean URL support using an image on the client side.
   $form['general']['clean_url'] = array(