From 5980db248ab4cc05e8596e07d7efc31048bcb8e8 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 16 Mar 2006 22:34:45 +0000
Subject: bug fixed: create_navigation_bar take into account clean URL if
 requested.

deletion: argument link_class (HTML class of links) in function
create_navigation_bar was removed, useless since branch 1.5.

bug fixed: rate_items are now a configuration parameter (set in config file)

modification: new functions library functions_rate.inc.php to reduce
picture.php length.

bug fixed: categories were never expanded in the menu since clean URLs.

bug fixed: changing pictures sorting order in main page was always
rederecting to root category.


git-svn-id: http://piwigo.org/svn/trunk@1084 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 category.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'category.php')

diff --git a/category.php b/category.php
index cf41e75ab..4aeaf0f36 100644
--- a/category.php
+++ b/category.php
@@ -28,6 +28,7 @@
 //--------------------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
@@ -47,6 +48,7 @@ if ( isset( $_GET['act'] )
   $url = 'category.php';
   redirect( $url );
 }
+
 //---------------------------------------------- change of image display order
 if (isset($_GET['image_order']))
 {
@@ -57,14 +59,13 @@ if (isset($_GET['image_order']))
     );
 
   redirect(
-    make_index_URL(
-      array(),
-      array('image_order')
+    duplicate_index_URL(
+      array(),        // nothing to redefine
+      array('start')  // changing display order goes back to section first page
       )
     );
 }
 //-------------------------------------------------------------- initialization
-include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
 // detection of the start picture to display
 if (!isset($page['start']))
 {
@@ -85,7 +86,7 @@ if (isset($page['cat_nb_images'])
     $page['cat_nb_images'],
     $page['start'],
     $user['nb_image_page'],
-    'back'
+    true
     );
 }
 else
-- 
cgit v1.2.3