Changeset 5685 for trunk/src/includes/common/template.php

Timestamp:

04/18/2015 03:33:53 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Common: Login actions:

• Extract functionality from bbp_wp_login_action() into a getter: bbp_get_wp_login_action()
• Update arguments inbbp_get_wp_login_action() to include optional url override
• Pass original $args into login action filter
• Also improve support for empty separator in breadcrumbs

File:

• trunk/src/includes/common/template.php (modified) (2 diffs)

trunk/src/includes/common/template.php

@@ -1199 +1199 @@
  */
 function bbp_wp_login_action( $args = array() ) {
-
-        // Parse arguments against default values
-        $r = bbp_parse_args( $args, array(
-                'action'  => '',
-                'context' => ''
-        ), '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, $r['context'] );
-
-        echo apply_filters( 'bbp_wp_login_action', $login_url, $r );
-}
+        echo esc_url( bbp_get_wp_login_action( $args ) );
+}
+
+        /**
+         * Return the login form action url
+         *
+         * @since bbPress (r5684)
+         *
+         * @param array $args This function supports these arguments:
+         *  - action: The action being taken
+         *  - context: The context the action is being taken from
+         * @uses add_query_arg() To add a arg to the url
+         * @uses site_url() Toget the site url
+         * @uses apply_filters() Calls 'bbp_wp_login_action' with the url and args
+         */
+        function bbp_get_wp_login_action( $args = array() ) {
+
+                // Parse arguments against default values
+                $r = bbp_parse_args( $args, array(
+                        'action'  => '',
+                        'context' => '',
+                        'url'     => 'wp-login.php'
+                ), 'login_action' );
+
+                // Add action as query arg
+                if ( ! empty( $r['action'] ) ) {
+                        $login_url = add_query_arg( array( 'action' => $r['action'] ), $r['url'] );
+
+                // No query arg
+                } else {
+                        $login_url = $r['url'];
+                }
+
+                $login_url = site_url( $login_url, $r['context'] );
+
+                return apply_filters( 'bbp_wp_login_action', $login_url, $r, $args );
+        }
 
 /**
@@ -2396 +2413 @@
                 if ( ! empty( $r['sep'] ) ) {
                         $sep = $r['sep_before'] . $r['sep'] . $r['sep_after'];
+                } else {
+                        $sep = '';
                 }