← Back to branch summary

~canonical-sysadmins/wordpress/4.7

« back to all changes in this revision

Viewing changes to wp-includes/canonical.php

  • Committer: Nick Moffitt
  • Date: 2015-01-15 11:04:26 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: nick.moffitt@canonical.com-20150115110426-5stm1p14cfnxrtme
New Upstream Version 4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/canonical.php
69
69
                return;
70
70
 
71
71
        // Some PHP setups turn requests for / into /index.php in REQUEST_URI
72
 
        // See: http://trac.wordpress.org/ticket/5017
73
 
        // See: http://trac.wordpress.org/ticket/7173
 
72
        // See: https://core.trac.wordpress.org/ticket/5017
 
73
        // See: https://core.trac.wordpress.org/ticket/7173
74
74
        // Disabled, for now:
75
75
        // $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
76
76
 
194
194
                } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
195
195
 
196
196
                        $term_count = 0;
197
 
                        foreach ( $wp_query->tax_query->queries as $tax_query )
 
197
                        foreach ( $wp_query->tax_query->queried_terms as $tax_query )
198
198
                                $term_count += count( $tax_query['terms'] );
199
199
 
200
200
                        $obj = $wp_query->get_queried_object();
492
492
 * @since 3.4.0
493
493
 * @access private
494
494
 *
 
495
 * @param string $query_string
 
496
 * @param array $args_to_check
 
497
 * @param string $url
495
498
 * @return string The altered query string
496
499
 */
497
500
function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
512
515
 * Attempts to guess the correct URL based on query vars
513
516
 *
514
517
 * @since 2.3.0
515
 
 * @uses $wpdb
 
518
 *
 
519
 * @global wpdb $wpdb WordPress database abstraction object.
516
520
 *
517
521
 * @return bool|string The correct URL if one is found. False on failure.
518
522
 */