From 54902df0a4d0c9cd0c93bc285c7388f6c9e5205e Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Tue, 3 Mar 2009 01:39:48 +0000
Subject: small code refactor - group together some code that should be
 together

git-svn-id: http://piwigo.org/svn/trunk@3167 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 picture.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'picture.php')

diff --git a/picture.php b/picture.php
index 28e11e3e3..5aac74be7 100644
--- a/picture.php
+++ b/picture.php
@@ -500,12 +500,6 @@ if (!empty($picture['current']['width']))
     );
 }
 
-$url_admin =
-  get_root_url().'admin.php?page=picture_modify'
-  .'&amp;cat_id='.(isset($page['category']) ? $page['category']['id'] : '')
-  .'&amp;image_id='.$page['image_id']
-;
-
 $slideshow_params = array();
 $slideshow_url_params = array();
 
@@ -713,6 +707,11 @@ if (is_admin())
       );
   }
 
+  $url_admin =
+    get_root_url().'admin.php?page=picture_modify'
+    .'&amp;cat_id='.(isset($page['category']) ? $page['category']['id'] : '')
+    .'&amp;image_id='.$page['image_id'];
+
   $template->assign(
     array(
       'U_CADDIE' => add_url_params($url_self,
@@ -721,6 +720,8 @@ if (is_admin())
       'U_ADMIN' => $url_admin,
       )
     );
+
+  $template->assign('available_permission_levels', $conf['available_permission_levels']);
 }
 
 // favorite manipulation
@@ -929,10 +930,7 @@ $element_content = trigger_event(
   );
 $template->assign( 'ELEMENT_CONTENT', $element_content );
 
-if (is_admin())
-{
-  $template->assign('available_permission_levels', $conf['available_permission_levels']);
-}
+
 // +-----------------------------------------------------------------------+
 // |                               sub pages                               |
 // +-----------------------------------------------------------------------+
-- 
cgit v1.2.3