aboutsummaryrefslogtreecommitdiffstats
path: root/include/section_init.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-04-13 23:57:55 +0000
committerrvelices <rv-github@modusoptimus.com>2007-04-13 23:57:55 +0000
commit1d02741910e961986c67216f98b97fce1c315312 (patch)
treea2351950d06e2b75978d5d72b0e9c56476b877d1 /include/section_init.inc.php
parentee399d727d38f1607b708aa941ba4bdd44e12c9e (diff)
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/branches/branch-1_7@1955 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/section_init.inc.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 9b16f937b..f58de2151 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -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,6 +350,7 @@ while (isset($tokens[$i]))
}
$page['chronology_date'] = $chronology_tokens;
}
+ unset($page['flat']);
}
$i++;