Changeset 16008

Timestamp:

10/27/2010 10:43:43 AM (16 years ago)

Author:

dd32

Message:

Use Absolute URL's & API's in header redirects in more locations. See #14062

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/import.php (modified) (1 diff)
• wp-admin/link.php (modified) (1 diff)
• wp-admin/media.php (modified) (2 diffs)
• wp-admin/moderation.php (modified) (1 diff)
• wp-admin/plugin-editor.php (modified) (2 diffs)
• wp-admin/post.php (modified) (2 diffs)
• wp-admin/themes.php (modified) (2 diffs)
• wp-admin/update-core.php (modified) (2 diffs)
• wp-admin/update.php (modified) (1 diff)
• wp-admin/widgets.php (modified) (2 diffs)
• wp-login.php (modified) (2 diffs)
• wp-register.php (modified) (1 diff)
• wp-signup.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -127 +127 @@
                         else
                                 $query_string = 'page=' . $plugin_page;
-                        wp_redirect( 'tools.php?' . $query_string );
+                        wp_redirect( admin_url('tools.php?' . $query_string) );
                         exit;
                 }

trunk/wp-admin/import.php

@@ -38 +38 @@
 
 if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][3]) ) {
-        wp_redirect("import.php?import=" . $popular_importers[$_GET['invalid']][3]);
+        wp_redirect( admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) );
         exit;
 }

trunk/wp-admin/link.php

@@ -25 +25 @@
         $linkcheck = $_POST['linkcheck'];
 
-$this_file = 'link-manager.php';
+$this_file = admin_url('link-manager.php');
 
 switch ($action) {

trunk/wp-admin/media.php

@@ -49 +49 @@
 
         if ( empty( $_GET['attachment_id'] ) ) {
-                wp_redirect('upload.php');
+                wp_redirect( admin_url('upload.php') );
                 exit();
         }
@@ -119 +119 @@
 
 default:
-        wp_redirect( 'upload.php' );
+        wp_redirect( admin_url('upload.php') );
         exit;
 

trunk/wp-admin/moderation.php

@@ -9 +9 @@
  */
 require_once('../wp-load.php');
-wp_redirect('edit-comments.php?comment_status=moderated');
+wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
 ?>

trunk/wp-admin/plugin-editor.php

@@ -68 +68 @@
                         exit;
                 }
-                wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
-        } else {
-                wp_redirect("plugin-editor.php?file=$file&scrollto=$scrollto");
+                wp_redirect( adin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+        } else {
+                wp_redirect( admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
         }
         exit;
@@ -88 +88 @@
                         activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
 
-                wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
+                wp_redirect( admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
                 exit;
         }

trunk/wp-admin/post.php

@@ -139 +139 @@
 
         if ( empty( $post_id ) ) {
-                wp_redirect("post.php");
+                wp_redirect( admin_url('post.php') );
                 exit();
         }
@@ -266 +266 @@
 
 default:
-                wp_redirect('edit.php');
+                wp_redirect( admin_url('edit.php') );
         exit();
         break;

trunk/wp-admin/themes.php

@@ -17 +17 @@
                 check_admin_referer('switch-theme_' . $_GET['template']);
                 switch_theme($_GET['template'], $_GET['stylesheet']);
-                wp_redirect('themes.php?activated=true');
+                wp_redirect( admin_url('themes.php?activated=true') );
                 exit;
         } else if ( 'delete' == $_GET['action'] ) {
@@ -24 +24 @@
                         wp_die( __( 'Cheatin’ uh?' ) );
                 delete_theme($_GET['template']);
-                wp_redirect('themes.php?deleted=true');
+                wp_redirect( admin_url('themes.php?deleted=true') );
                 exit;
         }

trunk/wp-admin/update-core.php

@@ -432 +432 @@
                 $plugins = (array) $_POST['checked'];
         } else {
-                wp_redirect('update-core.php');
+                wp_redirect( admin_url('update-core.php') );
                 exit;
         }
@@ -455 +455 @@
                 $themes = (array) $_POST['checked'];
         } else {
-                wp_redirect('update-core.php');
+                wp_redirect( admin_url('update-core.php') );
                 exit;
         }

trunk/wp-admin/update.php

@@ -71 +71 @@
                 check_admin_referer('activate-plugin_' . $plugin);
                 if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-                        wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
+                        wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
                         activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) );
-                        wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
+                        wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
                         die();
                 }

trunk/wp-admin/widgets.php

@@ -176 +176 @@
 
                 if ( !in_array($widget_id, $sidebar, true) ) {
-                        wp_redirect('widgets.php?error=0');
+                        wp_redirect( admin_url('widgets.php?error=0') );
                         exit;
                 }
@@ -209 +209 @@
 
         wp_set_sidebars_widgets($sidebars_widgets);
-        wp_redirect('widgets.php?message=0');
+        wp_redirect( admin_url('widgets.php?message=0') );
         exit;
 }

trunk/wp-login.php

@@ -431 +431 @@
 
         if ( is_wp_error($user) ) {
-                wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+                wp_redirect( site_url('wp-login.php?action=lostpassword&error=invalidkey') );
                 exit;
         }
@@ -485 +485 @@
         if ( is_multisite() ) {
                 // Multisite uses wp-signup.php
-                wp_redirect( apply_filters( 'wp_signup_location', get_bloginfo('wpurl') . '/wp-signup.php' ) );
+                wp_redirect( apply_filters( 'wp_signup_location', site_url('wp-signup.php') ) );
                 exit;
         }
 
         if ( !get_option('users_can_register') ) {
-                wp_redirect('wp-login.php?registration=disabled');
+                wp_redirect( site_url('wp-login.php?registration=disabled') );
                 exit();
         }

trunk/wp-register.php

@@ -11 +11 @@
 
 require('./wp-load.php');
-wp_redirect('wp-login.php?action=register');
+wp_redirect( site_url('wp-login.php?action=register') );
 
 ?>

trunk/wp-signup.php

@@ -24 +24 @@
 
 if ( !is_multisite() ) {
-        wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
+        wp_redirect( site_url('wp-login.php?action=register') );
         die();
 }