merge -r6944 from trunk
bug 1852: html redirections fail on admin pages git-svn-id: http://piwigo.org/svn/branches/2.1@6945 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
25f87ba0c7
commit
8ea132fcc0
1 changed files with 4 additions and 0 deletions
|
@ -579,6 +579,10 @@ function redirect_html( $url , $msg = '', $refresh_time = 0)
|
|||
load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) );
|
||||
$template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme());
|
||||
}
|
||||
elseif (defined('IN_ADMIN') and IN_ADMIN)
|
||||
{
|
||||
$template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme());
|
||||
}
|
||||
|
||||
if (empty($msg))
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue