aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-07-25 19:13:15 +0000
committerpatdenice <patdenice@piwigo.org>2011-07-25 19:13:15 +0000
commit5408f38ed4081a6ac5aae922799a0340f004db7c (patch)
treeb4704faf1c40b2dfa9a477aaef555fc5d92d06a8 /include
parent709745d836cb3c31dca7bcba9d8722541e153a40 (diff)
merge r11831 from trunk to branch 2.2
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
Diffstat (limited to 'include')
-rw-r--r--include/functions_url.inc.php4
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]);
}