aboutsummaryrefslogtreecommitdiffstats
path: root/picture.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2009-03-03 01:39:48 +0000
committerrvelices <rv-github@modusoptimus.com>2009-03-03 01:39:48 +0000
commit54902df0a4d0c9cd0c93bc285c7388f6c9e5205e (patch)
treec9856105c8c12c62d853cfb9e81dfef248176394 /picture.php
parent1d034894d99813b00cc564dd93f0057ea84f8694 (diff)
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
Diffstat (limited to '')
-rw-r--r--picture.php18
1 files changed, 8 insertions, 10 deletions
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 |
// +-----------------------------------------------------------------------+