2 files changed, 9 insertions, 16 deletions

diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index e6eac34f3..59809dad6 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -108,6 +108,7 @@ if (script_basename() == 'picture') // basename without file extention
     }
     else
     {
+      $page['image_id'] = 0; // more work in picture.php
       if ( !empty($matches[2]) )
       {
         $page['image_file'] = $matches[2];
@@ -562,12 +563,6 @@ if (isset($page['chronology_field']))
   initialize_calendar();
 }
 
-if (script_basename() == 'picture'
-    and !isset($page['image_id']) )
-{
-  $page['image_id'] = 0; // more work in picture.php
-}
-
 // add meta robots noindex, nofollow to avoid unnecesary robot crawls
 $page['meta_robots']=array();
 if ( isset($page['chronology_field'])
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'
-  .'&cat_id='.(isset($page['category']) ? $page['category']['id'] : '')
-  .'&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'
+    .'&cat_id='.(isset($page['category']) ? $page['category']['id'] : '')
+    .'&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                               |
 // +-----------------------------------------------------------------------+