diff options
| author | nikrou <nikrou@piwigo.org> | 2006-05-03 17:24:19 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2006-05-03 17:24:19 +0000 |
| commit | aafda98e9724cfad15826f0de23e9cdedda76a71 (patch) | |
| tree | 6c7c1749669c616cca004d49448146b4ad399294 /include | |
| parent | 9251fdf3fb46b9b1c1471d05dc67844ef6a3b011 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.inc.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 1a71112f7..f8f65c031 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -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 == '')) |