Show
Ignore:
Timestamp:
08/08/08 17:05:10 (4 months ago)
Author:
westi
Message:

Lots of fixes for Notices when WP_DEBUG is set. See #6669 props santosj.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-includes/canonical.php

    r7990 r8589  
    184184        $redirect['host'] = $original['host']; 
    185185 
    186     if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) { 
     186    $compare_original = array($original['host'], $original['path']); 
     187 
     188    if ( isset( $original['port'] ) ) 
     189        $compare_original[] = $original['port']; 
     190 
     191    if ( isset( $original['query'] ) ) 
     192        $compare_original[] = $original['query']; 
     193 
     194    $compare_redirect = array($redirect['host'], $redirect['path']); 
     195 
     196    if ( isset( $redirect['port'] ) ) 
     197        $compare_redirect[] = $redirect['port']; 
     198 
     199    if ( isset( $redirect['query'] ) ) 
     200        $compare_redirect[] = $redirect['query']; 
     201 
     202    if ( $compare_original !== $compare_redirect ) { 
    187203        $redirect_url = $redirect['scheme'] . '://' . $redirect['host']; 
    188204        if ( isset($redirect['port']) )