Commit 393c8e69 authored by Dries's avatar Dries

- Patch #652122 by catch, Berdir, mr.baileys, sun, David_Rothstein: access...

- Patch #652122 by catch, Berdir, mr.baileys, sun, David_Rothstein: access dashboard permission is useless.
parent efb349be
......@@ -27,7 +27,6 @@ class BlockTestCase extends DrupalWebTestCase {
'administer blocks',
filter_permission_name($full_html_format),
'access administration pages',
'access dashboard',
));
$this->drupalLogin($admin_user);
......
......@@ -29,7 +29,7 @@ function dashboard_menu() {
'title' => 'Dashboard',
'description' => 'View and customize your dashboard',
'page callback' => 'dashboard_admin',
'access arguments' => array('access dashboard'),
'access arguments' => array('access administration pages'),
// Make this appear first, so for example, in admin menus, it shows up on
// the top corner of the window as a convinient "home link".
'weight' => -100,
......@@ -39,7 +39,7 @@ function dashboard_menu() {
'description' => 'View and customize your dashboard',
'page callback' => 'dashboard_admin',
'page arguments' => array(TRUE),
'access arguments' => array('access dashboard'),
'access arguments' => array('access administration pages'),
'type' => MENU_CALLBACK,
);
$items['admin/dashboard/drawer'] = array(
......@@ -68,7 +68,6 @@ 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;
}
......@@ -154,18 +153,6 @@ function dashboard_page_build(&$page) {
}
}
/**
* Implements hook_permission().
*/
function dashboard_permission() {
return array(
'access dashboard' => array(
'title' => t('View the administrative dashboard'),
'description' => t('Note: modifying the dashboard requires the !administer_blocks permission.', array('!administer_blocks' => l(t('Administer blocks'), 'admin/people/permissions', array('fragment' => 'module-block')))),
),
);
}
/**
* Implements hook_system_info_alter().
*
......
......@@ -23,6 +23,12 @@ class DrupalAlterTestCase extends DrupalWebTestCase {
}
function testDrupalAlter() {
// This test depends on Garland, so make sure that it is always the current
// active theme.
global $theme, $base_theme_info;
$theme = 'garland';
$base_theme_info = array();
$array = array('foo' => 'bar');
$entity = new stdClass;
$entity->foo = 'bar';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment