'. st('Please check the error messages and try again.', array('!url' => request_uri())) .'
';
- }
-
- // Special handling of status messages
- if (isset($messages['status'])) {
- $warnings = count($messages['status']) > 1 ? st('The following installation warnings should be carefully reviewed, but in most cases may be safely ignored') : st('The following installation warning should be carefully reviewed, but in most cases may be safely ignored');
- $variables['messages'] .= '
'. $title .':
';
- $variables['messages'] .= theme('status_messages', 'status');
- }
-
- return theme_render_template('misc/maintenance.tpl.php', $variables);
-}
-
-/**
- * Return a themed list of maintenance tasks to perform.
- *
- * Note: this function is not themeable.
- */
-function theme_task_list($items, $active = NULL) {
- $done = isset($items[$active]) || $active == NULL;
- $output = '';
- foreach ($items as $k => $item) {
- if ($active == $k) {
- $class = 'active';
- $done = false;
- }
- else {
- $class = $done ? 'done' : '';
- }
- $output .= '
'. $item .'
';
- }
- $output .= '';
- return $output;
-}
-
/**
* Return a themed set of status and/or error messages. The messages are grouped
* by type.
@@ -1733,11 +1611,21 @@ function template_preprocess(&$variables, $hook) {
// Tell all templates where they are located.
$variables['directory'] = path_to_theme();
- // Flag front page status.
- $variables['is_front'] = drupal_is_front_page();
- // Tell all templates by which kind of user they're viewed.
- $variables['logged_in'] = ($user->uid > 0);
- $variables['is_admin'] = user_access('access administration pages');
+
+ // Set default variables that depend on the database.
+ $variables['is_admin'] = FALSE;
+ $variables['is_front'] = FALSE;
+ $variables['logged_in'] = FALSE;
+ if ($variables['db_is_active'] = db_is_active()) {
+ // Check for administrators.
+ if (user_access('access administration pages')) {
+ $variables['is_admin'] = TRUE;
+ }
+ // Flag front page status.
+ $variables['is_front'] = drupal_is_front_page();
+ // Tell all templates by which kind of user they're viewed.
+ $variables['logged_in'] = ($user->uid > 0);
+ }
}
/**
@@ -1750,6 +1638,9 @@ function template_preprocess(&$variables, $hook) {
* Uses the arg() function to generate a series of page template suggestions
* based on the current path.
*
+ * Any changes to variables in this preprocessor should also be changed inside
+ * template_preprocess_maintenance_page() to keep all them consistent.
+ *
* The $variables array contains the following arguments:
* - $content
* - $show_blocks
@@ -1757,7 +1648,7 @@ function template_preprocess(&$variables, $hook) {
* @see page.tpl.php
*/
function template_preprocess_page(&$variables) {
- /* Add favicon */
+ // Add favicon
if (theme_get_setting('toggle_favicon')) {
drupal_set_html_head('');
}
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
new file mode 100644
index 000000000000..cfc34e09bced
--- /dev/null
+++ b/includes/theme.maintenance.inc
@@ -0,0 +1,258 @@
+base_theme)) {
+ $base_theme[] = $new_base_theme = $themes[$themes[$ancestor]->base_theme];
+ $ancestor = $themes[$ancestor]->base_theme;
+ }
+ _init_theme($themes[$theme], array_reverse($base_theme), '_theme_load_offline_registry');
+
+ // These are usually added from system_init() -except maintenance.css.
+ // When the database is inactive it's not called so we add it here.
+ drupal_add_css(drupal_get_path('module', 'system') .'/defaults.css', 'module');
+ drupal_add_css(drupal_get_path('module', 'system') .'/system.css', 'module');
+ drupal_add_css(drupal_get_path('module', 'system') .'/system-menus.css', 'module');
+ drupal_add_css(drupal_get_path('module', 'system') .'/maintenance.css', 'module');
+}
+
+/**
+ * This builds the registry when the site needs to bypass any database calls.
+ */
+function _theme_load_offline_registry($theme, $base_theme = NULL, $theme_engine = NULL) {
+ $registry = _theme_build_registry($theme, $base_theme, $theme_engine);
+ _theme_set_registry($registry);
+}
+
+/**
+ * Return a themed list of maintenance tasks to perform.
+ */
+function theme_task_list($items, $active = NULL) {
+ $done = isset($items[$active]) || $active == NULL;
+ $output = '';
+ foreach ($items as $k => $item) {
+ if ($active == $k) {
+ $class = 'active';
+ $done = false;
+ }
+ else {
+ $class = $done ? 'done' : '';
+ }
+ $output .= '
'. $item .'
';
+ }
+ $output .= '';
+ return $output;
+}
+
+/**
+ * Generate a themed installation page.
+ *
+ * Note: this function is not themeable.
+ *
+ * @param $content
+ * The page content to show.
+ */
+function theme_install_page($content) {
+ drupal_set_header('Content-Type: text/html; charset=utf-8');
+
+ // Assign content.
+ $variables['content'] = $content;
+ // Delay setting the message variable so it can be processed below.
+ $variables['show_messages'] = FALSE;
+ // The maintenance preprocess function is recycled here.
+ template_preprocess_maintenance_page($variables);
+
+ // Special handling of error messages
+ $messages = drupal_set_message();
+ if (isset($messages['error'])) {
+ $title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process');
+ $variables['messages'] .= '
'. st('Please check the error messages and try again.', array('!url' => request_uri())) .'
';
+ }
+
+ // Special handling of status messages
+ if (isset($messages['status'])) {
+ $warnings = count($messages['status']) > 1 ? st('The following installation warnings should be carefully reviewed, but in most cases may be safely ignored') : st('The following installation warning should be carefully reviewed, but in most cases may be safely ignored');
+ $variables['messages'] .= '
'. $title .':
';
+ $variables['messages'] .= theme('status_messages', 'status');
+ }
+
+ return theme_render_template('themes/garland/maintenance-page.tpl.php', $variables);
+}
+
+/**
+ * Generate a themed update page.
+ *
+ * Note: this function is not themeable.
+ *
+ * @param $content
+ * The page content to show.
+ * @param $show_messages
+ * Whether to output status and error messages.
+ * FALSE can be useful to postpone the messages to a subsequent page.
+ */
+function theme_update_page($content, $show_messages = TRUE) {
+ // Set required headers.
+ drupal_set_header('Content-Type: text/html; charset=utf-8');
+
+ // Assign content and show message flag.
+ $variables['content'] = $content;
+ $variables['show_messages'] = $show_messages;
+ // The maintenance preprocess function is recycled here.
+ template_preprocess_maintenance_page($variables);
+
+ return theme_render_template('themes/garland/maintenance-page.tpl.php', $variables);
+}
+
+/**
+ * The variables generated here is a mirror of template_preprocess_page().
+ * This preprocessor will run it's course when theme_maintenance_page() is
+ * invoked. It is also used in theme_install_page() and theme_update_page() to
+ * keep all the variables consistent.
+ *
+ * An alternate template file of "maintenance-page-offline.tpl.php" can be
+ * used when the database is offline to hide errors and completely replace the
+ * content.
+ *
+ * The $variables array contains the following arguments:
+ * - $content
+ * - $show_blocks
+ *
+ * @see maintenance-page.tpl.php
+ */
+function template_preprocess_maintenance_page(&$variables) {
+ // Add favicon
+ if (theme_get_setting('toggle_favicon')) {
+ drupal_set_html_head('');
+ }
+
+ global $theme;
+ // Retrieve the theme data to list all available regions.
+ $theme_data = _system_theme_data();
+ $regions = $theme_data[$theme]->info['regions'];
+
+ // Get all region content set with drupal_set_content().
+ foreach (array_keys($regions) as $region) {
+ // Assign region to a region variable.
+ $region_content = drupal_get_content($region);
+ isset($variables[$region]) ? $variables[$region] .= $region_content : $variables[$region] = $region_content;
+ }
+
+ // Setup layout variable.
+ $variables['layout'] = 'none';
+ if (!empty($variables['left'])) {
+ $variables['layout'] = 'left';
+ }
+ if (!empty($variables['right'])) {
+ $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right';
+ }
+
+ // Construct page title
+ if (drupal_get_title()) {
+ $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
+ }
+ else {
+ $head_title = array(variable_get('site_name', 'Drupal'));
+ if (variable_get('site_slogan', '')) {
+ $head_title[] = variable_get('site_slogan', '');
+ }
+ }
+ $variables['head_title'] = implode(' | ', $head_title);
+ $variables['base_path'] = base_path();
+ $variables['breadcrumb'] = '';
+ $variables['feed_icons'] = '';
+ $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE));
+ $variables['head'] = drupal_get_html_head();
+ $variables['help'] = '';
+ $variables['language'] = $GLOBALS['language'];
+ $variables['logo'] = theme_get_setting('logo');
+ $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : '';
+ $variables['mission'] = '';
+ $variables['primary_links'] = array();
+ $variables['secondary_links'] = array();
+ $variables['search_box'] = '';
+ $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
+ $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
+ $variables['css'] = drupal_add_css();
+ $variables['styles'] = drupal_get_css();
+ $variables['scripts'] = drupal_get_js();
+ $variables['tabs'] = '';
+ $variables['title'] = drupal_get_title();
+ $variables['closure'] = '';
+
+ // Compile a list of classes that are going to be applied to the body element.
+ $body_classes = array();
+ $body_classes[] = 'in-maintenance';
+ if (isset($variables['db_is_active']) && !$variables['db_is_active']) {
+ $body_classes[] = 'db-offline';
+ }
+ if ($variables['layout'] == 'both') {
+ $body_classes[] = 'two-sidebars';
+ }
+ elseif ($variables['layout'] == 'none') {
+ $body_classes[] = 'no-sidebars';
+ }
+ else {
+ $body_classes[] = 'one-sidebar sidebar-'. $variables['layout'];
+ }
+ $variables['body_classes'] = implode(' ', $body_classes);
+
+ // Dead databases will show error messages so supplying this template will
+ // allow themers to override the page and the content completely.
+ if (isset($variables['db_is_active']) && !$variables['db_is_active']) {
+ $variables['template_file'] = 'maintenance-page-offline';
+ }
+}
diff --git a/install.php b/install.php
index 1716ffed93bf..4125b29afc4c 100644
--- a/install.php
+++ b/install.php
@@ -3,6 +3,8 @@
require_once './includes/install.inc';
+define('MAINTENANCE_MODE', 'install');
+
/**
* The Drupal installation happens in a series of steps. We begin by verifying
* that the current environment meets our minimum requirements. We then go
diff --git a/misc/maintenance.tpl.php b/misc/maintenance.tpl.php
deleted file mode 100644
index 24d554f4a634..000000000000
--- a/misc/maintenance.tpl.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- <?php print $head_title ?>
-
-
-
-
-
-
-
-
-
-
-
-