Ticket #2800: wp_referer.diff

wp-includes/pluggable.php

@@ -231 +231 @@
 function check_admin_referer($action = -1) {
         global $pagenow, $menu, $submenu, $parent_file, $submenu_file;;
         $adminurl = strtolower(get_settings('siteurl')).'/wp-admin';
-        $referer = strtolower($_SERVER['HTTP_REFERER']);
+        $referer = wp_get_referer();
         if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
                 !(-1 == $action && strstr($referer, $adminurl)) ) {
                 if ( $referer ) 

wp-includes/functions.php

@@ -1049 +1049 @@
 
 function wp_nonce_field($action = -1) {
         echo '<input type="hidden" name="_wpnonce" value="' . wp_create_nonce($action) . '" />';
+        wp_referer_field();
 }
 
+function wp_referer_field() {
+        $ref = ( false === wp_get_referer() ) ? $_SERVER['REQUEST_URI'] : wp_get_referer();
+        $ref = wp_specialchars(stripslashes($ref));
+        echo '<input type="hidden" name="_wp_'.$original.'http_referer" value="'. $ref . '" />';
+        if ( wp_get_original_referer() ) {
+                $original_ref = wp_specialchars(stripslashes(wp_get_original_referer()));
+                echo '<input type="hidden" name="_wp_original_http_referer" value="'. $original_ref . '" />';
+        }
+}
+
+function wp_original_referer_field() {
+        echo '<input type="hidden" name="_wp_original_http_referer" value="' . wp_specialchars(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
+}
+
+function wp_get_referer() {
+        foreach ( array($_REQUEST['_wp_http_referer'], $_SERVER['HTTP_REFERER']) as $ref )
+                if ( !empty($ref) )
+                        return $ref;
+        return false;
+}
+
+function wp_get_original_referer() {
+        if ( !empty($_REQUEST['_wp_original_http_referer']) )
+                return $_REQUEST['_wp_original_http_referer'];
+        return false;
+}
+
 function wp_mkdir_p($target) {
         // from php.net/mkdir user contributed notes
         if (file_exists($target)) {