security update core+modules
This commit is contained in:
@@ -784,5 +784,5 @@ function shortcut_link_add_inline($shortcut_set) {
|
||||
drupal_goto();
|
||||
}
|
||||
|
||||
return drupal_access_denied();
|
||||
return MENU_ACCESS_DENIED;
|
||||
}
|
||||
|
@@ -5,3 +5,9 @@ version = VERSION
|
||||
core = 7.x
|
||||
files[] = shortcut.test
|
||||
configure = admin/config/user-interface/shortcut
|
||||
|
||||
; Information added by Drupal.org packaging script on 2015-04-02
|
||||
version = "7.36"
|
||||
project = "drupal"
|
||||
datestamp = "1427943826"
|
||||
|
||||
|
@@ -211,16 +211,16 @@ class ShortcutLinksTestCase extends ShortcutTestCase {
|
||||
variable_set('theme_default', 'seven');
|
||||
|
||||
$this->drupalGet('page-that-does-not-exist');
|
||||
$this->assertNoRaw('add-shortcut', t('Add to shortcuts link was not shown on a page not found.'));
|
||||
$this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page not found.');
|
||||
|
||||
// The user does not have access to this path.
|
||||
$this->drupalGet('admin/modules');
|
||||
$this->assertNoRaw('add-shortcut', t('Add to shortcuts link was not shown on a page the user does not have access to.'));
|
||||
$this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page the user does not have access to.');
|
||||
|
||||
// Verify that the testing mechanism works by verifying the shortcut
|
||||
// link appears on admin/content/node.
|
||||
$this->drupalGet('admin/content/node');
|
||||
$this->assertRaw('add-shortcut', t('Add to shortcuts link was shown on a page the user does have access to.'));
|
||||
$this->assertRaw('add-shortcut', 'Add to shortcuts link was shown on a page the user does have access to.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -334,7 +334,7 @@ class ShortcutSetsTestCase extends ShortcutTestCase {
|
||||
$this->drupalPost('admin/config/user-interface/shortcut/' . $set->set_name . '/edit', array('title' => $existing_title), t('Save'));
|
||||
$this->assertRaw(t('The shortcut set %name already exists. Choose another name.', array('%name' => $existing_title)));
|
||||
$set = shortcut_set_load($set->set_name);
|
||||
$this->assertNotEqual($set->title, $existing_title, t('The shortcut set %title cannot be renamed to %new-title because a shortcut set with that title already exists.', array('%title' => $set->title, '%new-title' => $existing_title)));
|
||||
$this->assertNotEqual($set->title, $existing_title, format_string('The shortcut set %title cannot be renamed to %new-title because a shortcut set with that title already exists.', array('%title' => $set->title, '%new-title' => $existing_title)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user