summaryrefslogtreecommitdiff
path: root/modules/system/system.admin.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-18 12:07:39 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-18 12:07:39 +0000
commit245454bece3e3a460ed1504117a4dd7eb635fd8d (patch)
treee964263d96cfaace7ba6c3bf6db24ba4e64b06aa /modules/system/system.admin.inc
parent6babaebe025c76d7bda4c10c08b0ee0a797733a8 (diff)
downloadbrdo-245454bece3e3a460ed1504117a4dd7eb635fd8d.tar.gz
brdo-245454bece3e3a460ed1504117a4dd7eb635fd8d.tar.bz2
- Patch #790650 by casey: dashboard always appears in drag-and-drop mode when Seven is not used (and on 404 pages).
Diffstat (limited to 'modules/system/system.admin.inc')
-rw-r--r--modules/system/system.admin.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 4777f204f..6d9fb5767 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -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.