- Patch #652122 by mr.baileys, Berdir, catch: dashboard should insert itself as the default local task on /admin.

4 files changed, 22 insertions, 10 deletions

diff --git a/modules/block/block.test b/modules/block/block.test
index 91be85e2f..9c60726d7 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -21,7 +21,7 @@ class BlockTestCase extends DrupalWebTestCase {
     parent::setUp();
 
     // Create and login user
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters', 'access administration pages', 'access dashboard'));
     $this->drupalLogin($admin_user);
 
     // Define the existing regions
diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module
index 2ca73a629..46503d19b 100644
--- a/modules/dashboard/dashboard.module
+++ b/modules/dashboard/dashboard.module
@@ -62,6 +62,18 @@ function dashboard_menu() {
 }
 
 /**
+ * Implements hook_menu_alter().
+ */
+function dashboard_menu_alter(&$items) {
+  // Make the dashboard the default local task on /admin.
+  $items['admin']['title'] = 'Dashboard';
+  $items['admin']['page callback'] = 'dashboard_admin';
+  $items['admin']['access arguments'] = array('access dashboard');
+  $items['admin/dashboard']['type'] = MENU_DEFAULT_LOCAL_TASK;
+  $items['admin/by-task']['type'] = MENU_LOCAL_TASK;
+}
+
+/**
  * Implements hook_block_info_alter().
  *
  * Skip rendering dashboard blocks when not on the dashboard page itself. This
diff --git a/modules/simpletest/tests/session.test b/modules/simpletest/tests/session.test
index 2118f8501..7caecbe98 100644
--- a/modules/simpletest/tests/session.test
+++ b/modules/simpletest/tests/session.test
@@ -279,15 +279,15 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
 
     // Verify that user is logged in on secure URL.
     $this->curlClose();
-    $this->drupalGet($this->httpsUrl('admin'), array(), array('Cookie: ' . $cookie));
-    $this->assertText(t('Administer'));
+    $this->drupalGet($this->httpsUrl('admin/config'), array(), array('Cookie: ' . $cookie));
+    $this->assertText(t('Configuration'));
     $this->assertResponse(200);
 
     // Verify that user is not logged in on non-secure URL.
     if (!$is_https) {
       $this->curlClose();
-      $this->drupalGet('admin', array(), array('Cookie: ' . $cookie));
-      $this->assertNoText(t('Administer'));
+      $this->drupalGet('admin/config', array(), array('Cookie: ' . $cookie));
+      $this->assertNoText(t('Configuration'));
       $this->assertResponse(403);
     }
 
@@ -340,16 +340,16 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
     );
 
     foreach ($cookies as $cookie_key => $cookie) {
-      foreach (array('admin', $this->httpsUrl('admin')) as $url_key => $url) {
+      foreach (array('admin/config', $this->httpsUrl('admin/config')) as $url_key => $url) {
         $this->curlClose();
 
         $this->drupalGet($url, array(), array('Cookie: ' . $cookie));
         if ($cookie_key == $url_key) {
-          $this->assertText(t('Administer'));
+          $this->assertText(t('Configuration'));
           $this->assertResponse(200);
         }
         else {
-          $this->assertNoText(t('Administer'));
+          $this->assertNoText(t('Configuration'));
           $this->assertResponse(403);
         }
       }
diff --git a/modules/system/system.test b/modules/system/system.test
index 0bd05a45b..e33ad11a8 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1250,7 +1250,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
     );
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
 
-    $this->drupalGet('admin');
+    $this->drupalGet('admin/config');
     $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
 
     $this->drupalGet('node/' . $this->node->nid);
@@ -1268,7 +1268,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
     );
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
 
-    $this->drupalGet('admin');
+    $this->drupalGet('admin/config');
     $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
 
     $this->drupalGet('node/add');