diff --git a/core/includes/install.inc b/core/includes/install.inc index 84dd851..5111916 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -95,7 +95,7 @@ function drupal_install_profile_distribution_name() { // installation state (it might not be saved anywhere yet). if (drupal_installation_attempted()) { global $install_state; - return $install_state['profile_info']['distribution_name']; + return isset($install_state['profile_info']['distribution_name']) ? $install_state['profile_info']['distribution_name'] : 'Drupal'; } // At all other times, we load the profile via standard methods. else { diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 42a0985..d6a90c6 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -389,9 +389,9 @@ function _theme_save_registry($theme, $registry) { } /** - * Adds mobile friendly meta tags. + * Adds mobile friendly meta tags to the head of the HTML page. */ -function _theme_mobile_meta_tags() { +function _theme_add_mobile_meta_tags() { $elements = array( 'MobileOptimized' => array( '#tag' => 'meta', @@ -2845,7 +2845,7 @@ function template_preprocess_html(&$variables) { $variables['head_title'] = implode(' | ', $head_title); // Display the default mobile metatags for responsive design. - _theme_mobile_meta_tags(); + _theme_add_mobile_meta_tags(); // Populate the page template suggestions. if ($suggestions = theme_get_suggestions(arg(), 'html')) { @@ -3136,7 +3136,7 @@ function template_preprocess_maintenance_page(&$variables) { } // Display the default mobile metatags for responsive design. - _theme_mobile_meta_tags(); + _theme_add_mobile_meta_tags(); // Dead databases will show error messages so supplying this template will // allow themers to override the page and the content completely. @@ -3171,24 +3171,27 @@ function template_process_maintenance_page(&$variables) { /** * Process variables for install-page.tpl.php. * - * Calls template_preprocess_install_page() to modify the $variables + * Calls template_preprocess_maintenance_page() to modify the $variables * array. * * The $variables array contains the following arguments: * - $content * * @see install-page.tpl.php - * @see template_preprocess_install_page() + * @see template_preprocess_maintenance_page() */ function template_preprocess_install_page(&$variables) { - template_preprocess_maintenance_page($variables); + template_preprocess_maintenance_page($variables); + // Override the site name that is displayed on the page, since Drupal is + // still in the process of being installed. + $variables['site_name'] = drupal_install_profile_distribution_name(); } /** - * Theme process function for theme_install_page(). + * Theme process function for install-page.tpl.php. * * The variables array generated here is a mirror of template_process_html(). - * This processor will run its course when theme_install_page() is invoked. + * This processor will run its course when theme('install_page') is invoked. * * @see install-page.tpl.php * @see template_process_html() diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 9be4ab6..dfcf674 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -135,9 +135,6 @@ function seven_preprocess_install_page(&$variables) { drupal_add_js(drupal_get_path('theme', 'seven') . '/js/mobile.install.js'); drupal_add_css(drupal_get_path('theme', 'seven') . '/install-page.css', array('group' => CSS_AGGREGATE_THEME)); $variables['attributes']['class'][] = 'install-page'; - if(empty($variables['site_name'])) { - $variables['site_name'] = 'Drupal'; - } } /**