Changeset 1486

Timestamp:

Jul 21, 2006, 1:55:08 AM (18 years ago)

Author:

rvelices

Message:

merge -r1484:1485 from branch 1.6 to trunk (bug 481: Incorrect tag generation
in listing.xml for accentuated letters)

File:

• trunk/tools/create_listing_file.php (modified) (2 diffs)

trunk/tools/create_listing_file.php

@@ -137 +137 @@
   $value = str_replace(chr(0x00), ' ', $value);
 
-  return htmlentities($value);
+  return $value;
 }
 
@@ -155 +155 @@
       if ( preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
       {
-        $iptc[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
-      }
-    }
-  }
-
-  if (isset($iptc['keywords']))
-  {
-    // official keywords separator is the comma
-    $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
-    $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
-  }
+        $value = $matches[1].'-'.$matches[2].'-'.$matches[3];
+      }
+    }
+    if ($pwg_key == 'keywords')
+    {
+      // official keywords separator is the comma
+      $value = preg_replace('/[.;]/', ',', $value);
+      $value = preg_replace('/^,+|,+$/', '', $value);
+    }
+    $iptc[$pwg_key] = htmlentities($value);
+  }
+
   $iptc['keywords'] = implode(
                ',',