Commit 245454be authored by Dries's avatar Dries
Browse files

- Patch #790650 by casey: dashboard always appears in drag-and-drop mode when...

- Patch #790650 by casey: dashboard always appears in drag-and-drop mode when Seven is not used (and on 404 pages).
parent 6babaebe
......@@ -8,9 +8,6 @@ Drupal.behaviors.dashboard = {
attach: function () {
$('#dashboard').prepend('<div class="customize"><ul class="action-links"><li><a href="#">' + Drupal.t('Customize dashboard') + '</a></li></ul><div class="canvas"></div></div>');
$('#dashboard .customize .action-links a').click(Drupal.behaviors.dashboard.enterCustomizeMode);
if ($('#dashboard .region .block').length == 0) {
Drupal.settings.dashboard.launchCustomize = true;
}
Drupal.behaviors.dashboard.addPlaceholders();
if (Drupal.settings.dashboard.launchCustomize) {
Drupal.behaviors.dashboard.enterCustomizeMode();
......
......@@ -198,6 +198,14 @@ function dashboard_theme() {
* Whether to launch in customization mode right away. TRUE or FALSE.
*/
function dashboard_admin($launch_customize = FALSE) {
// Only continue if provided arguments are expected. This function serves
// as the callback for the top-level admin/ page, so any unexpected arguments
// are likely the result of someone typing in the URL of an administrative
// page that doesn't actually exist; for example, admin/some/random/page.
if (!is_bool($launch_customize)) {
return MENU_NOT_FOUND;
}
$js_settings = array(
'dashboard' => array(
'drawer' => url('admin/dashboard/drawer'),
......
......@@ -10,11 +10,12 @@
* Menu callback; Provide the administration overview page.
*/
function system_main_admin_page($arg = NULL) {
// If we received an argument, they probably meant some other page.
// Let's 404 them since the menu system cannot be told we do not
// accept arguments.
// Only continue if provided arguments are expected. This function serves
// as the callback for the top-level admin/ page, so any unexpected arguments
// are likely the result of someone typing in the URL of an administrative
// page that doesn't actually exist; for example, admin/some/random/page.
if (isset($arg) && substr($arg, 0, 3) != 'by-') {
return drupal_not_found();
return MENU_NOT_FOUND;
}
// Check for status report errors.
......
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