bug 331 fixed: html generated contains the code in header.tpl twice

when we use the function redirect
svn merge -r1296:1297 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1298 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2006-05-03 17:24:19 +00:00
parent 9251fdf3fb
commit aafda98e97

View file

@ -526,6 +526,13 @@ function redirect( $url , $msg = '', $refreh_time = 0)
{
global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug;
unset($template);
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
if (!isset($page['body_id']))
{
$page['body_id'] = 'adminPage';
}
// $redirect_msg, $refresh, $url_link and $title are required for creating an automated
// refresh page in header.tpl
if (!isset($msg) or ($msg == ''))