* or query in an attempt to figure the correct page to go to.
*
* @since 2.3.0
- * @uses $wp_rewrite
- * @uses $is_IIS
+ *
+ * @global WP_Rewrite $wp_rewrite
+ * @global bool $is_IIS
+ * @global WP_Query $wp_query
+ * @global wpdb $wpdb WordPress database abstraction object.
*
* @param string $requested_url Optional. The URL that was requested, used to
* figure if redirect is needed.
* @param bool $do_redirect Optional. Redirect to the new URL.
- * @return null|false|string Null, if redirect not needed. False, if redirect
- * not needed or the string of the URL
+ * @return string|void The string of the URL, if redirect needed.
*/
function redirect_canonical( $requested_url = null, $do_redirect = true ) {
- global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
+ global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
return;
return;
}
- if ( !$requested_url ) {
+ if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) {
// build the URL in the address bar
$requested_url = is_ssl() ? 'https://' : 'http://';
$requested_url .= $_SERVER['HTTP_HOST'];
}
$original = @parse_url($requested_url);
- if ( false === $original )
+ if ( false === $original ) {
return;
-
- // Some PHP setups turn requests for / into /index.php in REQUEST_URI
- // See: https://core.trac.wordpress.org/ticket/5017
- // See: https://core.trac.wordpress.org/ticket/7173
- // Disabled, for now:
- // $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
+ }
$redirect = $original;
$redirect_url = false;
if ( !isset($redirect['query']) )
$redirect['query'] = '';
+ // If the original URL ended with non-breaking spaces, they were almost
+ // certainly inserted by accident. Let's remove them, so the reader doesn't
+ // see a 404 error with no obvious cause.
+ $redirect['path'] = preg_replace( '|(%C2%A0)+$|i', '', $redirect['path'] );
+
// It's not a preview, so remove it from URL
if ( get_query_var( 'preview' ) ) {
$redirect['query'] = remove_query_arg( 'preview', $redirect['query'] );
$id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') );
if ( $id && $redirect_post = get_post($id) ) {
$post_type_obj = get_post_type_object($redirect_post->post_type);
- if ( $post_type_obj->public ) {
+ if ( $post_type_obj->public && 'auto-draft' != $redirect_post->post_status ) {
$redirect_url = get_permalink($redirect_post);
$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
}
}
}
+ if ( get_query_var( 'page' ) && $wp_query->post &&
+ false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
+ $redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+ $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+ $redirect_url = get_permalink( $wp_query->post->ID );
+ }
+
} elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
// rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
- if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) {
- if ( $redirect_url = get_attachment_link(get_query_var('attachment_id')) )
- $redirect['query'] = remove_query_arg('attachment_id', $redirect['query']);
+ if ( is_attachment() &&
+ ! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&
+ ! $redirect_url ) {
+ if ( ! empty( $_GET['attachment_id'] ) ) {
+ $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
+ if ( $redirect_url ) {
+ $redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] );
+ }
+ } else {
+ $redirect_url = get_attachment_link();
+ }
} elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
if ( $redirect_url = get_permalink(get_query_var('p')) )
$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
// paging and feeds
if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
- while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
+ while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
// Strip off paging and feed
$redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
$redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
- $redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging
+ $redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging
}
$addl_path = '';
}
}
- if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) {
- $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( 'comment-page-' . get_query_var('cpage'), 'commentpaged' );
+ if ( get_option( 'page_comments' ) && (
+ ( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) ||
+ ( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 )
+ ) ) {
+ $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' );
$redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
}
/** This filter is documented in wp-login.php */
$redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
} else {
- $redirect_url = site_url( 'wp-login.php?action=register' );
+ $redirect_url = wp_registration_url();
}
wp_redirect( $redirect_url, 301 );
$redirect_url .= '?' . $redirect['query'];
}
- if ( !$redirect_url || $redirect_url == $requested_url )
- return false;
+ if ( ! $redirect_url || $redirect_url == $requested_url ) {
+ return;
+ }
// Hex encoded octets are case-insensitive.
if ( false !== strpos($requested_url, '%') ) {
*/
$redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );
- if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
- return false;
+ // yes, again -- in case the filter aborted the request
+ if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) {
+ return;
+ }
if ( $do_redirect ) {
// protect against chained redirects
} else {
// Debug
// die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );
- return false;
+ return;
}
} else {
return $redirect_url;
return $query_string;
}
+/**
+ * Strips the #fragment from a URL, if one is present.
+ *
+ * @since 4.4.0
+ *
+ * @param string $url The URL to strip.
+ * @return string The altered URL.
+ */
+function strip_fragment_from_url( $url ) {
+ $parsed_url = @parse_url( $url );
+ if ( ! empty( $parsed_url['host'] ) ) {
+ // This mirrors code in redirect_canonical(). It does not handle every case.
+ $url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
+ if ( ! empty( $parsed_url['port'] ) ) {
+ $url .= ':' . $parsed_url['port'];
+ }
+ $url .= $parsed_url['path'];
+ if ( ! empty( $parsed_url['query'] ) ) {
+ $url .= '?' . $parsed_url['query'];
+ }
+ }
+
+ return $url;
+}
+
/**
* Attempts to guess the correct URL based on query vars
*
*
* @global wpdb $wpdb WordPress database abstraction object.
*
- * @return bool|string The correct URL if one is found. False on failure.
+ * @return false|string The correct URL if one is found. False on failure.
*/
function redirect_guess_404_permalink() {
- global $wpdb, $wp_rewrite;
+ global $wpdb;
if ( get_query_var('name') ) {
$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
return false;
if ( get_query_var( 'feed' ) )
return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
- elseif ( get_query_var( 'page' ) )
+ elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
else
return get_permalink( $post_id );
return false;
}
-add_action('template_redirect', 'redirect_canonical');
-
+/**
+ *
+ * @global WP_Rewrite $wp_rewrite
+ */
function wp_redirect_admin_locations() {
global $wp_rewrite;
if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
site_url( 'login', 'relative' ),
);
if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
- wp_redirect( site_url( 'wp-login.php', 'login' ) );
+ wp_redirect( wp_login_url() );
exit;
}
}
-
-add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff