aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-02-21 05:46:56 +0000
committerrvelices <rv-github@modusoptimus.com>2007-02-21 05:46:56 +0000
commit57278c296076ca1c7764ece6764e79c088a5bd5d (patch)
treeca54c19f8b1b5ce92ab06bcc8c76a3751dfa4291 /include
parentf579b7bef4684cdaf58a4ea00883c70d75e401d6 (diff)
- added check in redirect to see if headers have been sent before doing a redirect_http
- old category.php uses redirect_http whenever possible - replaced some old {L_xxx} in picture.tpl git-svn-id: http://piwigo.org/svn/trunk@1846 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions.inc.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index e09339982..4666c0fcb 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -689,7 +689,10 @@ function redirect( $url , $msg = '', $refresh_time = 0)
global $conf;
// with RefeshTime <> 0, only html must be used
- if (($conf['default_redirect_method'] == 'http') and ($refresh_time == 0))
+ if ($conf['default_redirect_method']=='http'
+ and $refresh_time==0
+ and !headers_sent()
+ )
{
redirect_http($url);
}