Changeset 15923

Timestamp:

10/22/2010 10:54:05 PM (16 years ago)

Author:

scribu

Message:

Introduce _qv_basename() and apply it to hierarchical taxonomies. See #9591.

File:

• trunk/wp-includes/query.php (modified) (6 diffs)

trunk/wp-includes/query.php

@@ -1466 +1466 @@
 
                                         if ( $t->rewrite['hierarchical'] ) {
-                                                $q[$t->query_var] = basename($q[$t->query_var]);
+                                                $q[$t->query_var] = $this->_qv_basename( $q[$t->query_var] );
                                         }
 
@@ -1785 +1785 @@
 
                 if ( '' != $q['name'] ) {
-                        $q['name'] = sanitize_title($q['name']);
+                        $q['name'] = sanitize_title( $q['name'] );
                         $where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
                 } elseif ( '' != $q['pagename'] ) {
@@ -1813 +1813 @@
                         $page_for_posts = get_option('page_for_posts');
                         if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-                                $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
-                                $page_paths = '/' . trim($q['pagename'], '/');
-                                $q['pagename'] = sanitize_title(basename($page_paths));
+                                $q['pagename'] = sanitize_title( $this->_qv_basename( $q['pagename'] ) );
                                 $q['name'] = $q['pagename'];
                                 $where .= " AND ($wpdb->posts.ID = '$reqpage')";
@@ -1827 +1825 @@
                         }
                 } elseif ( '' != $q['attachment'] ) {
-                        $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
-                        $attach_paths = '/' . trim($q['attachment'], '/');
-                        $q['attachment'] = sanitize_title(basename($attach_paths));
+                        $q['attachment'] = sanitize_title( $this->_qv_basename( $q['attachment'] ) );
                         $q['name'] = $q['attachment'];
                         $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
@@ -1962 +1958 @@
                                 }
                         }
-                        $q['author_name'] = sanitize_title($q['author_name']);
+                        $q['author_name'] = sanitize_title( $q['author_name'] );
                         $q['author'] = get_user_by('slug', $q['author_name']);
                         if ( $q['author'] )
@@ -3135 +3131 @@
                 return (bool) $this->is_404;
         }
+
+        /**
+         * i18n friendly way to get the last segment in a path
+         *
+         * @since 3.1.0
+         * @access private
+         *
+         * @param string $path The path
+         * @return string
+         */
+        function _qv_basename( $path ) {
+                return basename( str_replace( '%2F', '/', urlencode( urldecode( $path ) ) ) );
+        }
 }