diff options
author | rvelices <rv-github@modusoptimus.com> | 2012-02-09 21:11:34 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2012-02-09 21:11:34 +0000 |
commit | f6825cfb33d16796951ce29f28e2e99f61e3d903 (patch) | |
tree | a16d8fffbacb57ef35281e84410d9c7bff0cea6e /include/page_header.php | |
parent | 40280db9d81c299044533c4331af2c2854e4f959 (diff) |
- remove square/thumb from choices on picture
- fix content margin on password register
- purge derivative cache by type of derivative
- session saved infos/messages are not given to the page on html redirections
- shorter/faster code in functions_xxx
git-svn-id: http://piwigo.org/svn/trunk@13074 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/page_header.php')
-rw-r--r-- | include/page_header.php | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/include/page_header.php b/include/page_header.php index 3ed10fe47..e48740a01 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -66,7 +66,7 @@ if ( !empty($header_notes) ) } // No referencing is required -if ( !$conf['meta_ref'] ) +if ( !$conf['meta_ref'] ) { $page['meta_robots']['noindex'] = 1; $page['meta_robots']['nofollow'] = 1; @@ -81,8 +81,8 @@ if ( !empty($page['meta_robots']) ) ); } if ( !isset($page['meta_robots']['noindex']) ) -{ - $template->assign('meta_ref',1); +{ + $template->assign('meta_ref',1); } // refresh @@ -97,23 +97,22 @@ if ( isset( $refresh ) and intval($refresh) >= 0 ) )); } - - -// messages -foreach (array('errors','infos') as $mode) -{ - if (isset($_SESSION['page_'.$mode])) +else +{// messages only if no redirection + foreach (array('errors','infos') as $mode) { - $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]); - unset($_SESSION['page_'.$mode]); - } - - if (count($page[$mode]) != 0) - { - $template->assign($mode, $page[$mode]); + if (isset($_SESSION['page_'.$mode])) + { + $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]); + unset($_SESSION['page_'.$mode]); + } + + if (count($page[$mode]) != 0) + { + $template->assign($mode, $page[$mode]); + } } } - trigger_action('loc_end_page_header'); header('Content-Type: text/html; charset='.get_pwg_charset()); |