Changeset 25550

Timestamp:

09/21/2013 04:25:57 PM (11 years ago)

Author:

wonderboymusic

Message:

Use elseif when slurping the nonce in check_ajax_referer() to avoid accidentally overwriting it.

Fail wonderboymusic in [25433].
Props ocean90.
Fixes #25369.
See [25433].

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -833 +833 @@
     $nonce = '';
 
-    if ( $query_arg && isset( $_REQUEST[$query_arg] ) )
-        $nonce = $_REQUEST[$query_arg];
-
-    if ( isset( $_REQUEST['_ajax_nonce'] ) )
+    if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
+        $nonce = $_REQUEST[ $query_arg ];
+    elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
         $nonce = $_REQUEST['_ajax_nonce'];
-
-    if ( isset( $_REQUEST['_wpnonce'] ) )
+    elseif ( isset( $_REQUEST['_wpnonce'] ) )
         $nonce = $_REQUEST['_wpnonce'];