summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-02-08 20:39:54 (GMT)
committerGábor Hojtsy2008-02-08 20:39:54 (GMT)
commita48479c01d295c30bdcd93eb4436835e51f0b851 (patch)
tree5e769af0015ca49a11ea0cd974c10f158eaf9152
parentafb0e4b0565da3078f25997ec294d6765ee86125 (diff)
#184926 by Rob Loach: offline message was displayed to admin right after switching offline mode off
-rw-r--r--includes/menu.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 2bb593b..fb20e2f 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2354,8 +2354,11 @@ function _menu_site_is_offline() {
// Check if the user has administration privileges.
if (user_access('administer site configuration')) {
// Ensure that the off-line message is displayed only once [allowing for
- // page redirects].
- drupal_set_message(t('Operating in off-line mode.'), 'status', FALSE);
+ // page redirects], and specifically suppress its display on the site
+ // maintenance page.
+ if (drupal_get_normal_path($_GET['q']) != 'admin/settings/site-maintenance') {
+ drupal_set_message(t('Operating in off-line mode.'), 'status', FALSE);
+ }
}
else {
// Anonymous users get a FALSE at the login prompt, TRUE otherwise.