Changeset 18130

Timestamp:

06/03/2011 06:23:41 PM (14 years ago)

Author:

ryan

Message:

Properly return referrer when referer = true and echo = false. Props scribu, webduo. fixes #11953

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1955 +1955 @@
  * important to use nonce field in forms.
  *
- * If you set $echo to true and set $referer to true, then you will need to
- * retrieve the {@link wp_referer_field() wp referer field}. If you have the
- * $referer set to true and are echoing the nonce field, it will also echo the
- * referer field.
- *
  * The $action and $name are optional, but if you want to have better security,
  * it is strongly suggested to set those two parameters. It is easier to just
@@ -1983 +1978 @@
     $name = esc_attr( $name );
     $nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
+
+    if ( $referer )
+        $nonce_field .= wp_referer_field( false );
+
     if ( $echo )
         echo $nonce_field;
-
-    if ( $referer )
-        wp_referer_field( $echo );
 
     return $nonce_field;