Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#850060 by Dave Reid: Fixed Site mission token needs to be removed.

merge-requests/26/head
Angie Byron 2010-07-11 01:01:11 +00:00
parent ca73aba089
commit f83ac83582
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system/system.test
View File

@ -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('<front>', $url_options);
$tests['[site:url-brief]'] = preg_replace('!^https?://!', '', url('<front>', $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));

9
modules/system/system.tokens.inc
View File

@ -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;