adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

- remove square/thumb from choices on picture

Browse Source 
- 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
This commit is contained in:
rvelices
2012-02-09 21:11:34 +00:00
parent 40280db9d8
commit f6825cfb33
11 changed files with 94 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/page_header.php
+16 -17
View File
@@ -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());