adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r1955 from branch-1_7 to trunk:

Browse Source 
flat view small improvements (picture page on root category sorter urls and works in several cases)
correction in permalinks admin (error was assignment in if instead of comparison)

git-svn-id: http://piwigo.org/svn/trunk@1956 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-04-13 23:58:28 +00:00
parent 38ca856ea4
commit f386460ec3
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/section_init.inc.php
+12 -2
View File
@@ -140,6 +140,7 @@ if (0 === strpos(@$tokens[$next_token], 'categor'))
{
if ( strpos($tokens[$next_token], 'created-')!==0
and strpos($tokens[$next_token], 'posted-')!==0
and strpos($tokens[$next_token], 'start-')!==0
and $tokens[$next_token] != 'flat')
{// try a permalink
$cat_id = get_cat_id_from_permalink($tokens[$next_token]);
@@ -159,8 +160,16 @@ if (0 === strpos(@$tokens[$next_token], 'categor'))
unset($cat_id);
$next_token++;
}
elseif ( script_basename()=='picture' )
{ //access a picture only by id, file or id-file without given section
$page['flat']=true;
}
}
}
elseif ( script_basename()=='picture' )
{ //access a picture only by id, file or id-file without given section
$page['flat']=true;
}
}
else if (0 === strpos(@$tokens[$next_token], 'tag'))
{
@@ -314,7 +323,8 @@ while (isset($tokens[$i]))
}
if ('categories' == $page['section'] and
'flat' == $tokens[$i])
'flat' == $tokens[$i] and
!isset($page['chronology_field']) )
{
// indicate a special list of images
$page['flat'] = true;
@@ -340,12 +350,12 @@ while (isset($tokens[$i]))
}
$page['chronology_date'] = $chronology_tokens;
}
unset($page['flat']);
}
$i++;
}
// $page['nb_image_page'] is the number of picture to display on this page
// By default, it is the same as the $user['nb_image_page']
$page['nb_image_page'] = $user['nb_image_page'];