From f83ac83582aa943beac73fe6425443ce4e9623b0 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 11 Jul 2010 01:01:11 +0000 Subject: [PATCH] #850060 by Dave Reid: Fixed Site mission token needs to be removed. --- modules/system/system.test | 2 -- modules/system/system.tokens.inc | 9 --------- 2 files changed, 11 deletions(-) diff --git a/modules/system/system.test b/modules/system/system.test index e456e3744ed..5a857f34fe7 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -1510,7 +1510,6 @@ class TokenReplaceTestCase extends DrupalWebTestCase { $tests = array(); $tests['[site:name]'] = check_plain(variable_get('site_name', 'Drupal')); $tests['[site:slogan]'] = check_plain(variable_get('site_slogan', '')); - $tests['[site:mission]'] = filter_xss(variable_get('site_mission', '')); $tests['[site:mail]'] = 'simpletest@example.com'; $tests['[site:url]'] = url('', $url_options); $tests['[site:url-brief]'] = preg_replace('!^https?://!', '', url('', $url_options)); @@ -1527,7 +1526,6 @@ class TokenReplaceTestCase extends DrupalWebTestCase { // Generate and test unsanitized tokens. $tests['[site:name]'] = variable_get('site_name', 'Drupal'); $tests['[site:slogan]'] = variable_get('site_slogan', ''); - $tests['[site:mission]'] = variable_get('site_mission', ''); foreach ($tests as $input => $expected) { $output = token_replace($input, array(), array('language' => $language, 'sanitize' => FALSE)); diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc index 39c326f0e11..e13a4a2ab3e 100644 --- a/modules/system/system.tokens.inc +++ b/modules/system/system.tokens.inc @@ -36,10 +36,6 @@ function system_token_info() { 'name' => t("Slogan"), 'description' => t("The slogan of the site."), ); - $site['mission'] = array( - 'name' => t("Mission"), - 'description' => t("The optional 'mission' of the site."), - ); $site['mail'] = array( 'name' => t("Email"), 'description' => t("The administrative email address for the site."), @@ -160,11 +156,6 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a $replacements[$original] = $sanitize ? check_plain($slogan) : $slogan; break; - case 'mission': - $mission = variable_get('site_mission', ''); - $replacements[$original] = $sanitize ? filter_xss($mission) : $mission; - break; - case 'mail': $replacements[$original] = variable_get('site_mail', ''); break;