diff options
| author | patdenice <patdenice@piwigo.org> | 2011-07-25 19:10:30 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-07-25 19:10:30 +0000 |
| commit | 41202b1f2b42185e7b8020f856fead0ba0fb9e0b (patch) | |
| tree | c5fbddab2385c5117b5afb318f57faa7d8b2ff14 /include/functions_url.inc.php | |
| parent | b3b7af098201046184237f29b2b09b7b8795cfd1 (diff) | |
bug:2386
Bug in tag urls if tag start with a number
git-svn-id: http://piwigo.org/svn/trunk@11831 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_url.inc.php')
| -rw-r--r-- | include/functions_url.inc.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index a192d21cf..d290e3da1 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -507,6 +507,8 @@ function parse_section_url( $tokens, &$next_token) } elseif ( 'tags' == @$tokens[$next_token] ) { + global $conf; + $page['section'] = 'tags'; $page['tags'] = array(); @@ -523,7 +525,7 @@ function parse_section_url( $tokens, &$next_token) or strpos($tokens[$i], 'start-')===0 ) 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]); } |