Changeset 6964

Timestamp:

02/21/2008 11:49:05 PM (18 years ago)

Author:

ryan

Message:

Make pagename regex ungreedy. Fixes /pagename/2 links

File:

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

trunk/wp-includes/rewrite.php

@@ -219 +219 @@
                                         '(.+?)',
                                         '([^/]+)',
-                                        '([^/]+)',
+                                        '([^/]+?)',
                                         '(.+)'
                                         );
@@ -318 +318 @@
 
                 if ( ! $this->use_verbose_page_rules ) {
-                        $this->add_rewrite_tag('%pagename%', "(.+)", 'pagename=');
+                        $this->add_rewrite_tag('%pagename%', "(.+?)", 'pagename=');
                         $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
                         return $rewrite_rules;