Browse files

- Patch #733192 by pillarsdotnet, Sutharsan, Letharion, clemens.tolbo…

…om: tokens enclosed in [ ] are not recognized.
  • Loading branch information...
1 parent 7418ded commit d379f3d7bdfe4ef9c0f0fe629394048229d6c2e2 @dbuytaert dbuytaert committed Apr 23, 2011
Showing with 40 additions and 4 deletions.
  1. +11 −4 includes/token.inc
  2. +29 −0 modules/system/system.test
View
15 includes/token.inc
@@ -17,7 +17,7 @@
*
* Tokens follow the form: [$type:$name], where $type is a general class of
* tokens like 'node', 'user', or 'comment' and $name is the name of a given
- * placeholder. For example, [node:title].
+ * placeholder. For example, [node:title] or [node:created:since].
*
* In addition to raw text containing placeholders, modules may pass in an array
* of objects to be used when performing the replacement. The objects should be
@@ -103,9 +103,16 @@ function token_replace($text, array $data = array(), array $options = array()) {
* An associative array of discovered tokens, grouped by type.
*/
function token_scan($text) {
- // Matches tokens with the following pattern: [$type:$token]
- // $type and $token may not contain white spaces.
- preg_match_all('/\[([^\s\]:]*):([^\s\]]*)\]/', $text, $matches);
+ // Matches tokens with the following pattern: [$type:$name]
+ // $type and $name may not contain [ ] or whitespace characters.
+ // $type may not contain : characters, but $name may.
+ preg_match_all('/
+ \[ # [ - pattern start
+ ([^\s\[\]:]*) # match $type not containing whitespace : [ or ]
+ : # : - separator
+ ([^\s\[\]]*) # match $name not containing whitespace [ or ]
+ \] # ] - pattern end
+ /x', $text, $matches);
$types = $matches[1];
$tokens = $matches[2];
View
29 modules/system/system.test
@@ -1596,6 +1596,35 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
}
/**
+ * Test whether token-replacement works in various contexts.
+ */
+ function testSystemTokenRecognition() {
+ global $language;
+
+ // Generate prefixes and suffixes for the token context.
+ $tests = array(
+ array('prefix' => 'this is the ', 'suffix' => ' site'),
+ array('prefix' => 'this is the', 'suffix' => 'site'),
+ array('prefix' => '[', 'suffix' => ']'),
+ array('prefix' => '', 'suffix' => ']]]'),
+ array('prefix' => '[[[', 'suffix' => ''),
+ array('prefix' => ':[:', 'suffix' => '--]'),
+ array('prefix' => '-[-', 'suffix' => ':]:'),
+ array('prefix' => '[:', 'suffix' => ']'),
+ array('prefix' => '[site:', 'suffix' => ':name]'),
+ array('prefix' => '[site:', 'suffix' => ']'),
+ );
+
+ // Check if the token is recognized in each of the contexts.
+ foreach ($tests as $test) {
+ $input = $test['prefix'] . '[site:name]' . $test['suffix'];
+ $expected = $test['prefix'] . 'Drupal' . $test['suffix'];
+ $output = token_replace($input, array(), array('language' => $language));
+ $this->assertTrue($output == $expected, t('Token recognized in string %string', array('%string' => $input)));
+ }
+ }
+
+ /**
* Tests the generation of all system site information tokens.
*/
function testSystemSiteTokenReplacement() {

0 comments on commit d379f3d

Please sign in to comment.