Skip to content
Browse files

Use wp_redirect().

git-svn-id: http://svn.automattic.com/wordpress/trunk@3928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 9b8a99e commit ff19f4b5a552e47c36d4c2ab1ac20310bc942490 ryan committed
View
6 wp-admin/categories.php
@@ -31,7 +31,7 @@
wp_insert_category($_POST);
- header('Location: categories.php?message=1#addcat');
+ wp_redirect('categories.php?message=1#addcat');
break;
case 'delete':
@@ -52,7 +52,7 @@
wp_delete_category($cat_ID);
- header('Location: categories.php?message=2');
+ wp_redirect('categories.php?message=2');
break;
@@ -74,7 +74,7 @@
wp_update_category($_POST);
- header('Location: categories.php?message=3');
+ wp_redirect('categories.php?message=3');
break;
default:
View
16 wp-admin/comment.php
@@ -118,9 +118,9 @@
wp_delete_comment($comment->comment_ID);
if ((wp_get_referer() != '') && (false == $noredir)) {
- header('Location: ' . wp_get_referer());
+ wp_redirect(wp_get_referer());
} else {
- header('Location: '. get_settings('siteurl') .'/wp-admin/edit-comments.php');
+ wp_redirect(get_settings('siteurl') .'/wp-admin/edit-comments.php');
}
exit();
break;
@@ -145,9 +145,9 @@
wp_set_comment_status($comment->comment_ID, "hold");
if ((wp_get_referer() != "") && (false == $noredir)) {
- header('Location: ' . wp_get_referer());
+ wp_redirect(wp_get_referer());
} else {
- header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+ wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
}
exit();
break;
@@ -176,9 +176,9 @@
if ((wp_get_referer() != "") && (false == $noredir)) {
- header('Location: ' . wp_get_referer());
+ wp_redirect(wp_get_referer());
} else {
- header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+ wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
}
exit();
break;
@@ -194,9 +194,9 @@
$referredby = $_POST['referredby'];
if (!empty($referredby)) {
- header('Location: ' . $referredby);
+ wp_redirect($referredby);
} else {
- header ("Location: edit.php?p=$comment_post_ID&c=1#comments");
+ wp_redirect("edit.php?p=$comment_post_ID&c=1#comments");
}
break;
View
6 wp-admin/import/blogger.php
@@ -25,7 +25,7 @@ function greet() {
// Deletes saved data and redirect.
function restart() {
delete_option('import-blogger');
- header("Location: admin.php?import=blogger");
+ wp_redirect("admin.php?import=blogger");
die();
}
@@ -213,7 +213,7 @@ function set_next_step($step) {
// Redirects to next step
function do_next_step() {
- header("Location: admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
+ wp_redirect("admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
die();
}
@@ -273,7 +273,7 @@ function do_login() {
);
}
update_option('import-blogger', $this->import);
- header("Location: admin.php?import=blogger&noheader=true&step=1");
+ wp_redirect("admin.php?import=blogger&noheader=true&step=1");
}
die();
}
View
6 wp-admin/inline-uploading.php
@@ -41,7 +41,7 @@
wp_delete_attachment($attachment);
-header("Location: " . basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start");
+wp_redirect(basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start");
die;
case 'save':
@@ -102,7 +102,7 @@
add_post_meta($id, '_wp_attachment_metadata', array());
}
-header("Location: " . basename(__FILE__) . "?post=$post&all=$all&action=view&start=0");
+wp_redirect(basename(__FILE__) . "?post=$post&all=$all&action=view&start=0");
die();
case 'upload':
@@ -141,7 +141,7 @@
$attachments = $wpdb->get_results("SELECT ID, post_date, post_title, post_mime_type, guid FROM $wpdb->posts WHERE post_type = 'attachment' $and_type $and_post $and_user ORDER BY $sort LIMIT $start, $double", ARRAY_A);
if ( count($attachments) == 0 ) {
- header("Location: " . basename(__FILE__) ."?post=$post&action=upload" );
+ wp_redirect( basename(__FILE__) ."?post=$post&action=upload" );
die;
} elseif ( count($attachments) > $num ) {
$next = $start + count($attachments) - $num;
View
10 wp-admin/link.php
@@ -37,7 +37,7 @@
//for each link id (in $linkcheck[]) change category to selected value
if (count($linkcheck) == 0) {
- header('Location: '.$this_file);
+ wp_redirect($this_file);
exit;
}
@@ -49,7 +49,7 @@
$deleted++;
}
- header("Location: $this_file?deleted=$deleted");
+ wp_redirect("$this_file?deleted=$deleted");
break;
case 'move' :
@@ -61,14 +61,14 @@
//for each link id (in $linkcheck[]) change category to selected value
if (count($linkcheck) == 0) {
- header('Location: '.$this_file);
+ wp_redirect($this_file);
exit;
}
$all_links = join(',', $linkcheck);
// should now have an array of links we can change
//$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
- header('Location: '.$this_file);
+ wp_redirect($this_file);
break;
case 'add' :
@@ -76,7 +76,7 @@
add_link();
- header('Location: '.wp_get_referer().'?added=true');
+ wp_redirect(wp_get_referer().'?added=true');
break;
case 'save' :
View
2 wp-admin/moderation.php
@@ -70,7 +70,7 @@
}
$file = basename(__FILE__);
- header("Location: $file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam");
+ wp_redirect("$file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam");
exit();
break;
View
8 wp-admin/page.php
@@ -49,7 +49,7 @@
if ( isset($_POST['save']) )
$location = "page.php?action=edit&post=$page_ID";
- header("Location: $location");
+ wp_redirect($location);
exit();
break;
@@ -112,7 +112,7 @@
} else {
$location = 'page-new.php';
}
- header ('Location: ' . $location); // Send user on their way while we keep working
+ wp_redirect($location); // Send user on their way while we keep working
exit();
break;
@@ -138,12 +138,12 @@
if (strstr($sendback, 'page.php')) $sendback = get_settings('siteurl') .'/wp-admin/page.php';
elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
- header ('Location: ' . $sendback);
+ wp_redirect($sendback);
exit();
break;
default:
- header('Location: edit-pages.php');
+ wp_redirect('edit-pages.php');
exit();
break;
} // end switch
View
4 wp-admin/plugin-editor.php
@@ -44,9 +44,9 @@
$f = fopen($real_file, 'w+');
fwrite($f, $newcontent);
fclose($f);
- header("Location: plugin-editor.php?file=$file&a=te");
+ wp_redirect("plugin-editor.php?file=$file&a=te");
} else {
- header("Location: plugin-editor.php?file=$file");
+ wp_redirect("plugin-editor.php?file=$file");
}
exit();
View
4 wp-admin/plugins.php
@@ -12,14 +12,14 @@
include(ABSPATH . 'wp-content/plugins/' . trim( $_GET['plugin'] ));
do_action('activate_' . trim( $_GET['plugin'] ));
}
- header('Location: plugins.php?activate=true');
+ wp_redirect('plugins.php?activate=true');
} else if ('deactivate' == $_GET['action']) {
check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
$current = get_settings('active_plugins');
array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
update_option('active_plugins', $current);
do_action('deactivate_' . trim( $_GET['plugin'] ));
- header('Location: plugins.php?deactivate=true');
+ wp_redirect('plugins.php?deactivate=true');
}
exit;
}
View
8 wp-admin/post.php
@@ -52,7 +52,7 @@
if ( isset($_POST['save']) )
$location = "post.php?action=edit&post=$post_ID";
- header("Location: $location");
+ wp_redirect($location);
exit();
break;
@@ -119,7 +119,7 @@
$location = 'post-new.php';
}
- header ('Location: ' . $location); // Send user on their way while we keep working
+ wp_redirect($location); // Send user on their way while we keep working
exit();
break;
@@ -145,12 +145,12 @@
if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post-new.php';
elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
- header ('Location: ' . $sendback);
+ wp_redirect($sendback);
exit();
break;
default:
- header('Location: edit.php');
+ wp_redirect('edit.php');
exit();
break;
} // end switch
View
6 wp-admin/templates.php
@@ -47,12 +47,12 @@
if ( $f ) {
fwrite($f, $newcontent);
fclose($f);
- header("Location: templates.php?file=$file&a=te");
+ wp_redirect("templates.php?file=$file&a=te");
} else {
- header("Location: templates.php?file=$file&a=err");
+ wp_redirect("templates.php?file=$file&a=err");
}
} else {
- header("Location: templates.php?file=$file&a=err");
+ wp_redirect("templates.php?file=$file&a=err");
}
exit();
View
4 wp-admin/theme-editor.php
@@ -58,9 +58,9 @@
$f = fopen($real_file, 'w+');
fwrite($f, $newcontent);
fclose($f);
- header("Location: theme-editor.php?file=$file&theme=$theme&a=te");
+ wp_redirect("theme-editor.php?file=$file&theme=$theme&a=te");
} else {
- header("Location: theme-editor.php?file=$file&theme=$theme");
+ wp_redirect("theme-editor.php?file=$file&theme=$theme");
}
exit();
View
2 wp-admin/themes.php
@@ -13,7 +13,7 @@
do_action('switch_theme', get_current_theme());
- header('Location: themes.php?activated=true');
+ wp_redirect('themes.php?activated=true');
exit;
}
}
View
2 wp-admin/user-edit.php
@@ -47,7 +47,7 @@
if( !is_wp_error( $errors ) ) {
$redirect = "user-edit.php?user_id=$user_id&updated=true";
$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
- header("Location: $redirect");
+ wp_redirect($redirect);
exit;
}
View
12 wp-admin/users.php
@@ -124,7 +124,7 @@ function is_search() {
check_admin_referer('bulk-users');
if (empty($_POST['users'])) {
- header('Location: ' . $redirect);
+ wp_redirect($redirect);
}
if ( !current_user_can('edit_users') )
@@ -145,7 +145,7 @@ function is_search() {
$user->set_role($_POST['new_role']);
}
- header('Location: ' . add_query_arg('update', $update, $redirect));
+ wp_redirect(add_query_arg('update', $update, $redirect));
break;
@@ -154,7 +154,7 @@ function is_search() {
check_admin_referer('delete-users');
if ( empty($_POST['users']) ) {
- header('Location: ' . $redirect);
+ wp_redirect($redirect);
}
if ( !current_user_can('delete_users') )
@@ -185,7 +185,7 @@ function is_search() {
$redirect = add_query_arg('delete_count', $delete_count, $redirect);
- header('Location: ' . add_query_arg('update', $update, $redirect));
+ wp_redirect(add_query_arg('update', $update, $redirect));
break;
@@ -194,7 +194,7 @@ function is_search() {
check_admin_referer('bulk-users');
if ( empty($_POST['users']) )
- header('Location: ' . $redirect);
+ wp_redirect($redirect);
if ( !current_user_can('delete_users') )
$errors = new WP_Error('edit_users', __('You can’t delete users.'));
@@ -261,7 +261,7 @@ function is_search() {
else {
$new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_POST['user_login']), true));
$redirect = add_query_arg('usersearch', $new_user_login, $redirect);
- header('Location: ' . add_query_arg('update', $update, $redirect) . '#user-' . $user_id);
+ wp_redirect(add_query_arg('update', $update, $redirect) . '#user-' . $user_id);
die();
}
View
2 wp-content/themes/default/functions.php
@@ -123,7 +123,7 @@ function kubrick_add_theme_page() {
}
}
//print_r($_REQUEST);
- header("Location: themes.php?page=functions.php&saved=true");
+ wp_redirect("themes.php?page=functions.php&saved=true");
die;
}
add_action('admin_head', 'kubrick_theme_page_head');
View
2 wp-includes/pluggable.php
@@ -221,7 +221,7 @@ function auth_redirect() {
(empty($_COOKIE[USER_COOKIE])) ) {
nocache_headers();
- header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
+ wp_redirect(get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
exit();
}
}
View
5 wp-login.php
@@ -30,7 +30,7 @@
$redirect_to = 'wp-login.php';
if ( isset($_REQUEST['redirect_to']) )
- $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_REQUEST['redirect_to']);
+ $redirect_to = $_REQUEST['redirect_to'];
wp_redirect($redirect_to);
exit();
@@ -173,7 +173,6 @@ function focusit() {
$redirect_to = 'wp-admin/';
else
$redirect_to = $_REQUEST['redirect_to'];
- $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $redirect_to);
if( $_POST ) {
$user_login = $_POST['log'];
@@ -240,7 +239,7 @@ function focusit() {
<?php _e('Remember me'); ?></label></p>
<p class="submit">
<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="4" />
- <input type="hidden" name="redirect_to" value="<?php echo $redirect_to; ?>" />
+ <input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" />
</p>
</form>
<ul>
View
2 wp-trackback.php
@@ -55,7 +55,7 @@ function trackback_response($error = 0, $error_message = '') {
if (empty($title) && empty($tb_url) && empty($blog_name)) {
// If it doesn't look like a trackback at all...
- header('Location: ' . get_permalink($tb_id));
+ wp_redirect(get_permalink($tb_id));
exit;
}

0 comments on commit ff19f4b

Please sign in to comment.
Something went wrong with that request. Please try again.