iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-02 19:42:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1266 improve url parsing after bugs introduced for #626

Browse Source 
* /categories/123-album/start-10 now works
* /categories/permalink1/permalink2/start-20 now works (each permalink can contain several "/")
This commit is contained in:
plegall
2020-12-17 16:31:51 +01:00
parent af7e4028b0
commit a641b9eb08
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/functions_url.inc.php
View File

@@ -353,10 +353,19 @@ function make_section_in_url($params)
{
foreach ($params['combined_categories'] as $category)
{
$section_string.= '/'.$category['id'];
if ( $conf['category_url_style']=='id-name' )
$section_string.= '/';
if ( empty($category['permalink']) )
{
$section_string.= '-'.str2url($category['name']);
$section_string.= $category['id'];
if ( $conf['category_url_style']=='id-name' )
{
$section_string.= '-'.str2url($category['name']);
}
}
else
{
$section_string.= $category['permalink'];
}
}
}
@@ -434,9 +443,21 @@ function parse_section_url( $tokens, &$next_token)
$next_token++;
$i = $next_token;
$loop_counter = 0;
while (isset($tokens[$next_token]))
{
if ($loop_counter++ > count($tokens)+10){die('infinite loop?');}
if (
strpos($tokens[$next_token], 'created-')===0
or strpos($tokens[$next_token], 'posted-')===0
or strpos($tokens[$next_token], 'start-')===0
)
{
break;
}
if (preg_match('/^(\d+)(?:-(.+))?$/', $tokens[$next_token], $matches))
{
if ( isset($matches[2]) )
@@ -482,8 +503,16 @@ function parse_section_url( $tokens, &$next_token)
if ( isset($cat_id) )
{
$next_token += $perma_index+1;
$page['category'] = $cat_id;
$page['hit_by']['cat_permalink'] = $maybe_permalinks[$perma_index];
if (!isset($page['category']))
{
$page['category'] = $cat_id;
$page['hit_by']['cat_permalink'] = $maybe_permalinks[$perma_index];
}
else
{
$page['combined_categories'][] = $cat_id;
}
}
else
{

2
include/section_init.inc.php
View File

@@ -614,7 +614,7 @@ if ( $filter['enabled'] )
}
// see if we need a redirect because of a permalink
if ( 'categories'==$page['section'] and isset($page['category']) )
if ( 'categories'==$page['section'] and isset($page['category']) and !isset($page['combined_categories']))
{
$need_redirect=false;
if ( empty($page['category']['permalink']) )