Changeset 19159 for extensions/ExtendedDescription

Timestamp:

Nov 24, 2012, 11:27:54 PM (11 years ago)

Author:

mistic100

Message:

don't redirect on picture page when the redirect tag is on category description

File:

• extensions/ExtendedDescription/main.inc.php (modified) (2 diffs)

extensions/ExtendedDescription/main.inc.php

@@ -82 +82 @@
 {
   global $conf, $page;
-
-  if ($param != 'subcatify_category_description' and preg_match('#\[redirect (.*?)\]#i', $desc, $m1))
+  
+  if (
+    $param != 'subcatify_category_description'
+    and ( script_basename() != 'picture' or $param != 'main_page_category_description' )
+    and preg_match('#\[redirect (.*?)\]#i', $desc, $m1)
+  )
   {
     if (preg_match('#^(img|cat|search)=(\d*)\.?(\d*|)$#i', $m1[1], $m2))
@@ -199 +203 @@
 
 // Remove a category
-function ext_remove_cat($tpl_var, $categories)
+function ext_remove_cat($tpl_var)
 {
   global $conf;