Changeset 11832

Timestamp:

Jul 25, 2011, 9:13:15 PM (13 years ago)

Author:

patdenice

Message:

merge r11831 from trunk to branch 2.2
bug:2386
Bug in tag urls if tag start with a number

File:

• branches/2.2/include/functions_url.inc.php (modified) (2 diffs)

branches/2.2/include/functions_url.inc.php

@@ -508 +508 @@
   elseif ( 'tags' == @$tokens[$next_token] )
   {
+    global $conf;
+
     $page['section'] = 'tags';
     $page['tags'] = array();
@@ -524 +526 @@
         break;
 
-      if ( preg_match('/^(\d+)(?:-(.*))?/', $tokens[$i], $matches) )
+      if ( $conf['tag_url_style'] != 'tag' and preg_match('/^(\d+)(?:-(.*)|)$/', $tokens[$i], $matches) )
       {
         array_push($requested_tag_ids, $matches[1]);