Changeset 16155 for trunk/wp-includes/query.php

Timestamp:

11/02/2010 05:28:28 PM (16 years ago)

Author:

scribu

Message:

Use wp_basename() in WP_Query too. See #11887

File:

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

trunk/wp-includes/query.php

@@ -1482 +1482 @@
 
                                         if ( $t->rewrite['hierarchical'] ) {
-                                                $q[$t->query_var] = $this->_qv_basename( $q[$t->query_var] );
+                                                $q[$t->query_var] = wp_basename( $q[$t->query_var] );
                                         }
 
@@ -1811 +1811 @@
                         $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'] = sanitize_title_for_query( $this->_qv_basename( $q['pagename'] ) );
+                                $q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
                                 $q['name'] = $q['pagename'];
                                 $where .= " AND ($wpdb->posts.ID = '$reqpage')";
@@ -1823 +1823 @@
                         }
                 } elseif ( '' != $q['attachment'] ) {
-                        $q['attachment'] = sanitize_title_for_query( $this->_qv_basename( $q['attachment'] ) );
+                        $q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
                         $q['name'] = $q['attachment'];
                         $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
@@ -3126 +3126 @@
                 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 ) ) ) );
-        }
 }