Changeset 3370

Timestamp:

12/28/2005 01:48:29 AM (21 years ago)

Author:

ryan

Message:

Anchor str replacements to head so that we don't replace across the entire string. fixes #2162

File:

• trunk/wp-includes/classes.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -1462 +1462 @@
                         $home_path = parse_url(get_settings('home'));
                         $home_path = $home_path['path'];
+                        $home_path = trim($home_path, '/');
 
                         // Trim path info from the end and the leading home path from the
@@ -1468 +1469 @@
                         // requested permalink. 
                         $req_uri = str_replace($pathinfo, '', $req_uri);
-                        $req_uri = str_replace($home_path, '', $req_uri);
                         $req_uri = trim($req_uri, '/');
-                        $pathinfo = str_replace($home_path, '', $pathinfo);
+                        $req_uri = preg_replace("|^$home_path|", '', $req_uri);
+                        $req_uri = trim($req_uri, '/');
                         $pathinfo = trim($pathinfo, '/');
+                        $pathinfo = preg_replace("|^$home_path|", '', $pathinfo);
+                        $pathinfo = trim($pathinfo, '/');
+                        $self = trim($self, '/');
+                        $self = preg_replace("|^$home_path|", '', $self);
                         $self = str_replace($home_path, '', $self);
                         $self = trim($self, '/');