From a3b23df6ef58811247c4d75da02edf7bad2d73e7 Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 27 Sep 2007 22:46:17 +0000 Subject: - admin, comments and tags pages include page_header later in the code (as in picture and index) allowing plugins to change the header until the very end - fix in admin.php : picture_modify requires cache invalidation - fix in site_update.php : some echo func calls changed to $template->output .= ... - upgraded prototype.js to latest version 1.5.1.1 git-svn-id: http://piwigo.org/svn/trunk@2107 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'admin.php') diff --git a/admin.php b/admin.php index 004bac218..c327010b3 100644 --- a/admin.php +++ b/admin.php @@ -74,7 +74,6 @@ $conf_link = $link_start.'configuration&section='; $title = l10n('PhpWebGallery Administration'); // for include/page_header.php $page['page_banner'] = '

'.l10n('PhpWebGallery Administration').'

'; $page['body_id'] = 'theAdminPage'; -include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('admin' => 'admin.tpl')); @@ -115,7 +114,7 @@ if ($conf['ws_access_control']) // Do we need to display ws_checker ); } -// required before plugin page inclusion +//---------------------------------------------------------------- plugin menus $plugin_menu_links = array( array( 'NAME' => l10n('admin'), @@ -124,16 +123,15 @@ $plugin_menu_links = array( ); $plugin_menu_links = trigger_event('get_admin_plugin_menu_links', $plugin_menu_links ); - - -include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php'); - -//------------------------------------------------------------- content display foreach ($plugin_menu_links as $menu_item) { $template->assign_block_vars('plugin_menu.menu_item', $menu_item); } +include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php'); + +//------------------------------------------------------------- content display + // +-----------------------------------------------------------------------+ // | errors & infos | // +-----------------------------------------------------------------------+ @@ -154,6 +152,7 @@ if (count($page['infos']) != 0) } } +include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->parse('admin'); // +-----------------------------------------------------------------------+ @@ -171,6 +170,7 @@ if ( 'cat_options', // ?only POST; public/private; lock/unlock 'cat_perm', // ?only POST 'element_set', // ?only POST; associate/dissociate + 'picture_modify', // ?only POST; associate/dissociate 'user_list', // ?only POST; group assoc 'user_perm', 'group_perm', -- cgit v1.2.3