From ae6cd8f9280d83d555becb468fc60efe500b5f42 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 2 May 2007 23:08:45 +0000 Subject: merge r1996 from trunk to branch-1_7 correct bug on one of my previous commits (flat for picture page) git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1997 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/section_init.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 24efb8319..b0baec3bb 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -162,7 +162,7 @@ $page = array_merge( $page, parse_well_known_params_url( $tokens, $next_token) ) if ( script_basename()=='picture' and 'categories'==$page['section'] and - !isset($page['chronology_field']) ) + !isset($page['category']) and !isset($page['chronology_field']) ) { //access a picture only by id, file or id-file without given section $page['flat']=true; } -- cgit v1.2.3