Changeset 28610
- Timestamp:
- 05/29/2014 04:12:05 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/canonical.php
r28215 r28610 341 341 unset($redirect['port']); 342 342 343 if ( ! empty( $user_home['scheme'] ) && $user_home['scheme'] === 'https' ) { 344 $redirect['scheme'] = 'https'; 345 } 346 343 347 // trailing /index.php 344 348 $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']); … … 398 402 $redirect['host'] = $original['host']; 399 403 400 $compare_original = array( $original['host'], $original['path']);404 $compare_original = array( $original['scheme'], $original['host'], $original['path'] ); 401 405 402 406 if ( !empty( $original['port'] ) ) … … 406 410 $compare_original[] = $original['query']; 407 411 408 $compare_redirect = array( $redirect['host'], $redirect['path']);412 $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] ); 409 413 410 414 if ( !empty( $redirect['port'] ) )
Note: See TracChangeset
for help on using the changeset viewer.