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
This commit is contained in:
parent
1d034894d9
commit
54902df0a4
2 changed files with 9 additions and 16 deletions
18
picture.php
18
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 |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue