- 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

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);
   }