Changeset 4482

Timestamp:

11/23/2012 10:59:15 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Extract:

• Remove extract() from bbp_wp_login_action().
• See #2056.

File:

• trunk/includes/common/template-tags.php (modified) (1 diff)

trunk/includes/common/template-tags.php

@@ -1036 +1036 @@
  */
 function bbp_wp_login_action( $args = '' ) {
-    $defaults = array (
+
+    // Parse args with default parameters
+    $r = bbp_parse_args( $args, array(
         'action'  => '',
         'context' => ''
-    );
-    $r = bbp_parse_args( $args, $defaults, 'login_action' );
-    extract( $r );
-
-    if ( !empty( $action ) )
-        $login_url = add_query_arg( array( 'action' => $action ), 'wp-login.php' );
-    else
+    ), 'login_action' );
+
+    // Add action as query arg
+    if ( !empty( $r['action'] ) ) {
+        $login_url = add_query_arg( array( 'action' => $r['action'] ), 'wp-login.php' );
+
+    // No query arg
+    } else {
         $login_url = 'wp-login.php';
-
-    $login_url = site_url( $login_url, $context );
+    }
+
+    $login_url = site_url( $login_url, $r['context'] );
 
     echo apply_filters( 'bbp_wp_login_action', $login_url, $args );