Changeset 11832


Ignore:
Timestamp:
07/25/11 21:13:15 (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/include/functions_url.inc.php

    r9353 r11832  
    508508  elseif ( 'tags' == @$tokens[$next_token] ) 
    509509  { 
     510    global $conf; 
     511 
    510512    $page['section'] = 'tags'; 
    511513    $page['tags'] = array(); 
     
    524526        break; 
    525527 
    526       if ( preg_match('/^(\d+)(?:-(.*))?/', $tokens[$i], $matches) ) 
     528      if ( $conf['tag_url_style'] != 'tag' and preg_match('/^(\d+)(?:-(.*)|)$/', $tokens[$i], $matches) ) 
    527529      { 
    528530        array_push($requested_tag_ids, $matches[1]); 
Note: See TracChangeset for help on using the changeset viewer.