From 2f9af75438c58b1aab3e66a8eee81d0168488ed6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 19 Apr 2009 19:10:08 +0000
Subject: - Patch #430342 by kkaefer et al: usability improvement: changed
 'site maintenance' to 'maintenance mode'.

---
 includes/bootstrap.inc         | 2 +-
 includes/menu.inc              | 6 +++---
 includes/theme.maintenance.inc | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'includes')

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index a77343adf..19231cb7e 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1246,7 +1246,7 @@ function _drupal_bootstrap($phase) {
  * Enables use of the theme system without requiring database access.
  *
  * Loads and initializes the theme system for site installs, updates and when
- * the site is in offline mode. This also applies when the database fails.
+ * the site is in maintenance mode. This also applies when the database fails.
  *
  * @see _drupal_maintenance_theme()
  */
diff --git a/includes/menu.inc b/includes/menu.inc
index d045ca186..a935003bf 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2719,15 +2719,15 @@ function menu_path_is_external($path) {
  *   TRUE for anonymous users not on the login page if the site is offline.
  */
 function _menu_site_is_offline() {
-  // Check if site is set to offline mode.
+  // Check if site is set to maintenance mode.
   if (variable_get('site_offline', 0)) {
     // Check if the user has administration privileges.
     if (user_access('administer site configuration')) {
       // Ensure that the offline message is displayed only once [allowing for
       // 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 offline mode. <a href="@url">Go online.</a>', array('@url' => url('admin/settings/site-maintenance'))), 'status', FALSE);
+      if (drupal_get_normal_path($_GET['q']) != 'admin/settings/maintenance-mode') {
+        drupal_set_message(t('Operating in maintenance mode. <a href="@url">Go online.</a>', array('@url' => url('admin/settings/maintenance-mode'))), 'status', FALSE);
       }
     }
     else {
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 02e4f492b..f2278d670 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -8,7 +8,7 @@
 
 /**
  * Sets up the theming system for site installs, updates and when the site is
- * in offline mode. It also applies when the database is unavailable.
+ * in maintenance mode. It also applies when the database is unavailable.
  *
  * Minnelli is always used for the initial install and update operations. In
  * other cases, "settings.php" must have a "maintenance_theme" key set for the
-- 
cgit v1.2.3