? 0-field-tokens-D7.patch ? 0-temp.patch ? 0-token-get-info-type-D7.patch ? 0-token-lightestterm-D7.patch ? 0-token-upgrade-info-D7.patch ? 0-user-text-field-tokens.txt ? 125640-token-profile-D7.patch ? 550164-token-current-page-query-tokens-D7.patch ? 776952-token-blocks-D7.patch ? 821008-token-devel-D7.patch ? 829744-token-entity-path-D7.patch ? 844912-token-search-tokens-D7.patch ? 845146-token-presort-tokens-D7.patch ? 845148-token-user-email-tree-D7.patch ? jquery-ui-tree ? jstree ? menu.tokens.inc ? patches ? temp-D7.patch ? temp-token-entity-id-D7.patch ? tests ? token.inc ? treeTable Index: token.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/token/token.test,v retrieving revision 1.20 diff -u -p -r1.20 token.test --- token.test 13 Nov 2010 19:12:45 -0000 1.20 +++ token.test 13 Nov 2010 19:34:29 -0000 @@ -171,6 +171,20 @@ class TokenMenuTestCase extends TokenTes ); $this->assertTokens('node', $node, $tokens); } + + function testMenuItemAccess() { + variable_set('menu_options_page', array('main-menu', 'management')); + // Fetch the mlid of the administer + $admin_mlid = db_query("SELECT mlid FROM {menu_links} WHERE menu_name = 'management' AND link_path = 'admin'")->fetchField(); + $node_link = array( + 'enabled' => TRUE, + 'link_title' => 'Admin node link', + 'plid' => $admin_mlid, + 'customized' => 0, + 'description' => '', + ); + $node = $this->drupalCreateNode(array('menu' => $node_link)); + } } class TokenTaxonomyTestCase extends TokenTestHelper { Index: token.tokens.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/token/token.tokens.inc,v retrieving revision 1.27 diff -u -p -r1.27 token.tokens.inc --- token.tokens.inc 13 Nov 2010 19:12:45 -0000 1.27 +++ token.tokens.inc 13 Nov 2010 19:34:29 -0000 @@ -157,6 +157,11 @@ function token_token_info() { 'name' => t('Page number'), 'description' => t('The page number of the current page when viewing paged lists.'), ); + $info['tokens']['current-page']['query'] = array( + 'name' => t('Query string parameter'), + 'description' => t('The page number of the current page when viewing paged lists.'), + 'dynamic' => TRUE, + ); return $info; } @@ -329,6 +334,15 @@ function token_tokens($type, $tokens, ar break; } } + + // Query string tokens. + if ($query_tokens = token_find_with_prefix($tokens, 'query')) { + foreach ($query_tokens as $name => $original) { + if (isset($_GET[$name])) { + $replacements[$original] = $sanitize ? check_plain($_GET[$name]) : $_GET[$name]; + } + } + } } // Entity tokens.