Changeset 1956 for trunk/include/section_init.inc.php

Timestamp:

Apr 14, 2007, 1:58:28 AM (17 years ago)

Author:

rvelices

Message:

merge r1955 from branch-1_7 to trunk:
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)

File:

• trunk/include/section_init.inc.php (modified) (4 diffs)

trunk/include/section_init.inc.php

@@ -141 +141 @@
       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
@@ -160 +161 @@
         $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;
   }
 }
@@ -315 +324 @@
 
   if ('categories' == $page['section'] and
-      'flat' == $tokens[$i])
+      'flat' == $tokens[$i] and
+      !isset($page['chronology_field']) )
   {
     // indicate a special list of images
@@ -341 +351 @@
       $page['chronology_date'] = $chronology_tokens;
     }
+    unset($page['flat']);
   }
 
   $i++;
 }
-
 
 // $page['nb_image_page'] is the number of picture to display on this page