Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.480 diff -u -p -r1.480 theme.inc --- includes/theme.inc 29 Apr 2009 08:04:23 -0000 1.480 +++ includes/theme.inc 29 Apr 2009 18:12:32 -0000 @@ -906,7 +906,6 @@ function drupal_find_theme_templates($ca */ function theme_get_settings($key = NULL) { $defaults = array( - 'mission' => '', 'default_logo' => 1, 'logo_path' => '', 'default_favicon' => 1, @@ -918,7 +917,6 @@ function theme_get_settings($key = NULL) 'toggle_name' => 1, 'toggle_search' => 0, 'toggle_slogan' => 0, - 'toggle_mission' => 1, 'toggle_node_user_picture' => 0, 'toggle_comment_user_picture' => 0, 'toggle_comment_user_verification' => 1, @@ -966,14 +964,6 @@ function theme_get_setting($setting_name $themes = list_themes(); $theme_object = $themes[$theme_key]; - if ($settings['mission'] == '') { - $settings['mission'] = variable_get('site_mission', ''); - } - - if (!$settings['toggle_mission']) { - $settings['mission'] = ''; - } - if ($settings['toggle_logo']) { if ($settings['default_logo']) { $settings['logo'] = base_path() . dirname($theme_object->filename) . '/logo.png'; @@ -1826,11 +1816,6 @@ function template_preprocess_page(&$vari $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right'; } - // Set mission when viewing the frontpage. - if (drupal_is_front_page()) { - $mission = filter_xss_admin(theme_get_setting('mission')); - } - // Construct page title if (drupal_get_title()) { $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); @@ -1852,7 +1837,6 @@ function template_preprocess_page(&$vari $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; - $variables['mission'] = isset($mission) ? $mission : ''; $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); Index: includes/theme.maintenance.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v retrieving revision 1.24 diff -u -p -r1.24 theme.maintenance.inc --- includes/theme.maintenance.inc 22 Apr 2009 09:45:02 -0000 1.24 +++ includes/theme.maintenance.inc 29 Apr 2009 18:12:32 -0000 @@ -252,7 +252,6 @@ function template_preprocess_maintenance $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; - $variables['mission'] = ''; $variables['main_menu'] = array(); $variables['secondary_menu'] = array(); $variables['search_box'] = ''; Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1043 diff -u -p -r1.1043 node.module --- modules/node/node.module 29 Apr 2009 17:48:11 -0000 1.1043 +++ modules/node/node.module 29 Apr 2009 18:12:33 -0000 @@ -2020,7 +2020,6 @@ function node_feed($nids = FALSE, $chann 'version' => '2.0', 'title' => variable_get('site_name', 'Drupal'), 'link' => $base_url, - 'description' => variable_get('site_mission', ''), 'language' => $language->language ); $channel = array_merge($channel_defaults, $channel); Index: modules/system/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v retrieving revision 1.18 diff -u -p -r1.18 page.tpl.php --- modules/system/page.tpl.php 2 Mar 2009 19:23:54 -0000 1.18 +++ modules/system/page.tpl.php 29 Apr 2009 18:12:33 -0000 @@ -41,8 +41,6 @@ * in theme settings. * - $site_slogan: The slogan of the site, empty when display has been disabled * in theme settings. - * - $mission: The text of the site mission, empty when display has been disabled - * in theme settings. * * Navigation: * - $search_box: HTML to display the search box, empty if search has been disabled. @@ -62,6 +60,7 @@ * - $feed_icons: A string of all feed icons for the current page. * - $left: The HTML for the left sidebar. * - $right: The HTML for the right sidebar. + * - $highlight: The HTML for the highlighted content region. * * Footer/closing data: * - $footer_message: The footer message as defined in the admin settings. @@ -138,7 +137,7 @@