adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-09 10:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r11831 from trunk to branch 2.2

Browse Source 
bug:2386
Bug in tag urls if tag start with a number

git-svn-id: http://piwigo.org/svn/branches/2.2@11832 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-07-25 19:13:15 +00:00
parent 709745d836
commit 5408f38ed4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_url.inc.php
+3 -1
View File
@@ -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]);
}