Permalink
Browse files

Fix #978772 by wojtha: Duplicate tokens error message on the Status R…

…eport
  • Loading branch information...
1 parent ad29a7f commit 8288dd428f24a9a86c0a297918731e19ef7677d4 @wojtha committed Jan 7, 2011
Showing with 6 additions and 2 deletions.
  1. +4 −0 CHANGELOG.txt
  2. +1 −1 nodesymlinks.admin.inc
  3. +1 −1 nodesymlinks.module
View
@@ -1,5 +1,9 @@
// $Id:$
+NodeSymlinks 6.x-1.0-beta5, 2011-01-07
+------------------------------------
+#978772 by wojtha: Fixed duplicate tokens error message on the Status Report
+
NodeSymlinks 6.x-1.0-beta4, 2011-01-07
------------------------------------
#993650 by djac: Fixing HTTP 403 error for users with administer menu but without administer symlinks permission
View
@@ -113,7 +113,7 @@ function nodesymlinks_settings($form_state) {
'#type' => 'checkbox',
'#title' => t('Use node tokens'),
'#default_value' => variable_get('nodesymlinks_node_tokens', 0),
- '#description' => t('When enabled, it allows you to use the <em>node tokens</em> inside the <a href="@url-pattern">nodesymlinks pathauto pattern</a>. However it will consume slightly more resources and you will get <strong>Duplicate tokens error</strong> on the <a href="@url-status">Status report</a> page. So enable this only when you really need it.', array('@url-pattern' => url($pathauto_url), '@url-status' => url('admin/reports/status'))),
+ '#description' => t('When enabled, it allows you to use the <em>node tokens</em> inside the <a href="@url-pattern">nodesymlinks pathauto pattern</a>. However it will consume slightly more resources. So enable this only when you really need it.', array('@url-pattern' => url($pathauto_url))),
);
}
View
@@ -227,7 +227,7 @@ function nodesymlinks_token_list($type = 'all') {
$tokens['nodesymlinks']['nodesymlinks-menu-link-plid'] = t("The unique ID of the node's menu link parent.");
// Access also node tokens
- if (variable_get('nodesymlinks_node_tokens', 0)) {
+ if (variable_get('nodesymlinks_node_tokens', 0) && $type == 'nodesymlinks') {
$tokens += token_get_list('node');
}
}

0 comments on commit 8288dd4

Please sign in to comment.