diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-09-16 17:21:26 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-09-16 17:21:26 +0000 |
| commit | 8ea132fcc0544ab4879a3b335737194638476bcd (patch) | |
| tree | 094117b13acafa4ca46ccb24346da0aa5c518fe2 | |
| parent | 25f87ba0c7691050c17d119ee8c84294394beff0 (diff) | |
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
| -rw-r--r-- | include/functions.inc.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 551ad72c0..822c36da0 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -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)) { |