Changeset 3167

Timestamp:

03/03/09 02:39:48 (4 years ago)

Author:

rvelices

Message:

small code refactor - group together some code that should be together

Location:

trunk

Files:

• include/section_init.inc.php (modified) (2 diffs)
• picture.php (modified) (4 diffs)

trunk/include/section_init.inc.php

@@ -109 +109 @@
     else
     {
+      $page['image_id'] = 0; // more work in picture.php
       if ( !empty($matches[2]) )
       {
@@ -563 +564 @@
 }
 
-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();

trunk/picture.php

@@ -501 +501 @@
 }
 
-$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();
@@ -714 +708 @@
   }
 
+  $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(
@@ -722 +721 @@
       )
     );
+
+  $template->assign('available_permission_levels', $conf['available_permission_levels']);
 }
 
@@ -930 +931 @@
 $template->assign( 'ELEMENT_CONTENT', $element_content );
 
-if (is_admin())
-{
-  $template->assign('available_permission_levels', $conf['available_permission_levels']);
-}
+
 // +-----------------------------------------------------------------------+
 // |                               sub pages                               |