Changeset 1648 for trunk/gregarius/cls

Timestamp:

01/02/07 14:24:57 (20 months ago)

Author:

mbonetti

Message:

More uniform handling of UTF-8 uri generation. Will probably need better
filtering in rss_uri(). Fix for #150, too.

Location:

trunk/gregarius/cls

Files:

• channels.php (modified) (1 diff)
• items.php (modified) (2 diffs)

trunk/gregarius/cls/channels.php

@@ -90 +90 @@
             //$this->rlink = getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $title)."/";
             /* EXPERIMENTAL! */
-            $this->rlink = getPath() . utf8_uri_encode(preg_replace('/[\s&\/\+]/','_',$title)) . "/";
+            $this->rlink = getPath(rss_uri($title)) . "/";
         } else {
             $this->rlink = getPath()."feed.php?channel=$id";

trunk/gregarius/cls/items.php

@@ -73 +73 @@
             $this->title = "[nt]";
         }
-        $this->escapedTitle = preg_replace("/[^A-Za-z0-9%\.]/", "_", utf8_uri_encode($title));
+        $this->escapedTitle = rss_uri($title); //preg_replace("/[^A-Za-z0-9%\.]/", "_", utf8_uri_encode($title));
+        
         $this->url = trim($url);
         $this->enclosure = $enclosure;
@@ -136 +137 @@
             $this->iconUrl = $icon;
         }
-        $this->escapedTitle = preg_replace("/[^A-Za-z0-9\.]/", "_", $title);
+        //$this->escapedTitle = preg_replace("/[^A-Za-z0-9\.]/", "_", $title);
+        $this->escapedTitle = rss_uri($title);
     }