Changeset 9437

Timestamp:

Mar 1, 2011, 12:22:40 AM (13 years ago)

Author:

plg

Message:

bug fixed: the redirect on "home / level1 / level2" was applied to
"home / level1" as well

bug fixed: incompatibility with $confquestion_mark_in_urls = false,
make_index_url() or make_picture_url() care about relative path, no need to
start url with get_absolute_root_url

File:

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

extensions/ExtendedDescription/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Extended Description
-Version: 2.1.e
+Version: auto
 Description: Add multilinguale descriptions, banner, NMB, category name, etc...
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=175
@@ -64 +64 @@
   global $conf, $page;
 
-  if (isset($page['category']) and !isset($page['image_id']) and preg_match('#\[redirect (.*?)\]#i', $desc, $m1))
+  if ($param == 'main_page_category_description' and isset($page['category']) and !isset($page['image_id']) and preg_match('#\[redirect (.*?)\]#i', $desc, $m1))
   {
     if (preg_match('#^(img|cat|search)=(\d*)\.?(\d*|)$#i', $m1[1], $m2))
     {
-      $url  = get_absolute_root_url();
       switch ($m2[1])
       {
@@ -77 +76 @@
           $url_params['category'] = array('id' => $m2[3], 'name' => '', 'permalink' => '');
         }
-        $url .= rtrim(make_picture_url($url_params), '-');
+        $url = rtrim(make_picture_url($url_params), '-');
         break;
 
         case 'cat':
         $url_params = array('category' => array('id' => $m2[2], 'name' => '', 'permalink' => ''));
-        $url .= rtrim(make_index_url($url_params), '-');
+        $url = rtrim(make_index_url($url_params), '-');
         break;
 
         case 'search':
-        $url .= make_index_url(array('section' => 'search', 'search' => $m2[2]));
+        $url = make_index_url(array('section' => 'search', 'search' => $m2[2]));
       }
     }