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

- Patch #677662 by heyrocker: fixed in several hook_token() implementations so that language options get set properly.

merge-requests/26/head
Dries Buytaert 2010-01-07 20:55:49 +00:00
parent 605d450aca
commit 6dc7e86b80
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/comment/comment.tokens.inc
View File

@ -180,11 +180,12 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
// Comment related URLs.
case 'url':
$replacements[$original] = url('comment/' . $comment->cid, array('absolute' => TRUE, 'fragment' => 'comment-' . $comment->cid));
$url_options['fragment'] = 'comment-' . $comment->cid;
$replacements[$original] = url('comment/' . $comment->cid, $url_options);
break;
case 'edit-url':
$replacements[$original] = url('comment/' . $comment->cid . '/edit', array('absolute' => TRUE));
$replacements[$original] = url('comment/' . $comment->cid . '/edit', $url_options);
break;
// Default values for the chained tokens handled below.

4
modules/node/node.tokens.inc
View File

@ -163,11 +163,11 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'url':
$replacements[$original] = url('node/' . $node->nid, array('absolute' => TRUE));
$replacements[$original] = url('node/' . $node->nid, $url_options);
break;
case 'edit-url':
$replacements[$original] = url('node/' . $node->nid . '/edit', array('absolute' => TRUE));
$replacements[$original] = url('node/' . $node->nid . '/edit', $url_options);
break;
// Default values for the chained tokens handled below.

1
modules/poll/poll.tokens.inc
View File

@ -40,7 +40,6 @@ function poll_token_info() {
* Implements hook_tokens().
*/
function poll_tokens($type, $tokens, array $data = array(), array $options = array()) {
$url_options = array('absolute' => TRUE);
$sanitize = !empty($options['sanitize']);
$replacements = array();