Changeset 1229 for trunk

Timestamp:

Apr 21, 2006, 2:04:11 AM (19 years ago)

Author:

rvelices

Message:

merge r1228 from branch-1_6 into trunk

bug 345: cannot browse categories (Club Internet modified web server provides
PATH_INFO even if it is empty)

fix 339: also added in create_listing_file.php

Location:

trunk

Files:

• include/section_init.inc.php (modified) (1 diff)
• tools/create_listing_file.php (modified) (1 diff)

trunk/include/section_init.inc.php

@@ -54 +54 @@
 $page['section'] = 'categories';
 
-if ( isset($_SERVER["PATH_INFO"]) )
+if ( isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
 {
   $rewritten = $_SERVER["PATH_INFO"];

trunk/tools/create_listing_file.php

@@ -166 +166 @@
     $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
   }
-
+  $iptc['keywords'] = implode(
+               ',',
+               array_unique(
+                 explode(
+                   ',',
+                   $iptc['keywords']
+                   )
+                 )
+               );
   return $iptc;
 }