Changeset 3908

Timestamp:

06/24/06 05:38:37 (3 years ago)

Author:

ryan

Message:

wp_get_referer() and friends from robmiller and markjaquith. fixes #2800

Files:

• trunk/wp-admin/options.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-admin/options.php

@@ -78 +78 @@
-    }
-    
-$_SERVER['HTTP_REFERER']
-$_SERVER['HTTP_REFERER']
+wp_get_referer()
+wp_get_referer()
-    $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
-    wp_redirect($goback);

trunk/wp-includes/functions.php

@@ -812 +812 @@
-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_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;
-}
-

trunk/wp-includes/pluggable.php

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