merge 3145-3146 from trunk

Last (I hope) paranoic optims ...
- move get_uysername and get_groupname from public to admin/functions.inc.php
- optim in index.php
- tags.tpl does not need smarty modifier included
- move func get_comment_post_key from functions_comment to functions (avoid extra inclusion every time on picture page)

git-svn-id: http://piwigo.org/svn/branches/2.0@3147 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 6 insertions, 6 deletions

diff --git a/index.php b/index.php
index eaea36635..ac1835544 100644
--- a/index.php
+++ b/index.php
@@ -228,8 +228,11 @@ if ( count($page['items']) > 0
   // image order
   $order_idx = pwg_get_session_var( 'image_order', 0 );
 
-  $orders = get_category_preferred_image_orders();
-  foreach ($orders as $order_id => $order)
+  $url = add_url_params(
+          duplicate_index_url(),
+          array('image_order' => '')
+        );
+  foreach (get_category_preferred_image_orders() as $order_id => $order)
   {
     if ($order[2])
     {
@@ -237,10 +240,7 @@ if ( count($page['items']) > 0
         'image_orders',
         array(
           'DISPLAY' => $order[0],
-          'URL' => add_url_params(
-            duplicate_index_url(),
-            array('image_order' => $order_id)
-            ),
+          'URL' => $url.$order_id,
           'SELECTED' => ($order_idx == $order_id ? true:false),
           )
         );