Changeset 1846

Timestamp:

Feb 21, 2007, 6:46:56 AM (17 years ago)

Author:

rvelices

Message:

• 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

Location:

trunk

Files:

• category.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• template/yoga/picture.tpl (modified) (1 diff)

trunk/category.php

@@ -57 +57 @@
 }
 
-redirect ( make_index_url($url_params) );
+$url = make_index_url($url_params);
+if (!headers_sent())
+{
+  set_status_header(302);
+  redirect_http( $url );
+}
+redirect ( $url );
 
 ?>

trunk/include/functions.inc.php

@@ -690 +690 @@
 
   // 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);

trunk/template/yoga/picture.tpl

@@ -45 +45 @@
 <!-- END last_unactive -->
 <!-- BEGIN next -->
-  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
+  <a class="navButton next" href="{next.U_IMG}" title="{lang:next_page} : {next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
 <!-- END next -->
 <!-- BEGIN next_unactive -->
   <a class="navButton next"><img src="{pwg_root}{themeconf:icon_dir}/right_unactive.png" class="button" alt="{lang:next_page}"></a>
 <!-- END next_unactive -->
-  <a class="navButton up" href="{U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
+  <a class="navButton up" href="{U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{lang:thumbnails}"></a>
 <!-- BEGIN previous -->
-  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
+  <a class="navButton prev" href="{previous.U_IMG}" title="{lang:previous_page} : {previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
 <!-- END previous -->
 <!-- BEGIN previous_unactive -->