Ticket #10141: registration.patch

wp-content/themes/default/sidebar.php

@@ -67 +67 @@
 
                                 <li><h2>Meta</h2>
                                 <ul>
-                                        <?php wp_register(); ?>
+                                        <li><?php wp_registration(); ?></li>
                                         <li><?php wp_loginout(); ?></li>
                                         <li><a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
                                         <li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>

wp-includes/default-widgets.php

@@ -293 +293 @@
                         echo $before_title . $title . $after_title;
 ?>
                         <ul>
-                        <?php wp_register(); ?>
+                        <li><?php wp_registration(); ?></li>
                         <li><?php wp_loginout(); ?></li>
                         <li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php echo esc_attr(__('Syndicate this site using RSS 2.0')); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
                         <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php echo esc_attr(__('The latest comments to all posts in RSS')); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>

wp-includes/deprecated.php

@@ -1690 +1690 @@
         the_author_meta('ID');
 }
 
+/**
+ * Display the Registration or Admin link.
+ *
+ * Display a link which allows the user to navigate to the registration page if
+ * not logged in and registration is enabled or to the dashboard if logged in.
+ *
+ * @since 1.5.0
+ * @deprecated 2.8.1
+ * @deprecated Use wp_registration()
+ */
+function wp_register( $before = '<li>', $after = '</li>' ) {
+        _deprecated_function(__FUNCTION__, '2.8.1', 'wp_registration()');
+        echo $before;
+        wp_registration('');
+        echo $after;
+}
+
 ?>
+ No newline at end of file

wp-includes/general-template.php

@@ -138 +138 @@
  * or log out depending on whether or not they are currently logged in.
  *
  * @since 1.5.0
+ * @uses wp_login_url() to retrievethe Log In URL
+ * @uses wp_logout_url() to retrievethe Log Out URL
  * @uses apply_filters() Calls 'loginout' hook on HTML link content.
  *
  * @param string $redirect Optional path to redirect to on login/logout.
@@ -152 +154 @@
 }
 
 /**
+ * Display the Registration or Admin link.
+ *
+ * Display a link which allows the user to navigate to the registration page if
+ * not logged in and registration is enabled or to the dashboard if logged in.
+ *
+ * @since 2.8.1
+ * @uses wp_registration_url() to retrievethe Registration URL
+ * @uses apply_filters() Calls 'registration' hook on register / admin link content.
+ *
+ * @param string $redirect Optional path to redirect to on registration.
+ */
+function wp_registration($redirect = '') {
+
+        if ( ! is_user_logged_in() ) {
+                if ( get_option('users_can_register') )
+                        $link = $before . '<a href="' . esc_url( wp_registration_url($redirect) ) . '">' . __('Register') . '</a>' . $after;
+                else
+                        $link = '';
+        } else {
+                $link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
+        }
+
+        echo apply_filters('registration', $link);
+}
+
+/**
  * Returns the Log Out URL.
  *
  * Returns the URL that allows the user to log out of the site
  *
- * @since 2.7
+ * @since 2.7.0
  * @uses wp_nonce_url() To protect against CSRF
  * @uses site_url() To generate the log in URL
  * @uses apply_filters() calls 'logout_url' hook on final logout url
@@ -180 +208 @@
  *
  * Returns the URL that allows the user to log in to the site
  *
- * @since 2.7
+ * @since 2.7.0
  * @uses site_url() To generate the log in URL
  * @uses apply_filters() calls 'login_url' hook on final login url
  *
@@ -197 +225 @@
 }
 
 /**
+ * Returns the Registration URL.
+ *
+ * Returns the URL that allows the user to registre
+ *
+ * @since 2.8.1
+ * @uses site_url() To generate the registration URL
+ * @uses apply_filters() calls 'registration_url' hook on the registration url
+ *
+ * @param string $redirect Path to redirect to on registration.
+ */
+function wp_registration_url($redirect = '') {
+        $args = array( 'action' => 'register' );
+        if ( !empty($redirect) ) {
+                $args['redirect_to'] = $redirect;
+        }
+
+        $registration_url = add_query_arg($args, site_url('wp-login.php', 'login'));
+        return apply_filters('registration_url', $registration_url, $redirect);
+}
+
+/**
  * Returns the Lost Password URL.
  *
  * Returns the URL that allows the user to retrieve the lost password
@@ -218 +267 @@
 }
 
 /**
- * Display the Registration or Admin link.
- *
- * Display a link which allows the user to navigate to the registration page if
- * not logged in and registration is enabled or to the dashboard if logged in.
- *
- * @since 1.5.0
- * @uses apply_filters() Calls 'register' hook on register / admin link content.
- *
- * @param string $before Text to output before the link (defaults to <li>).
- * @param string $after Text to output after the link (defaults to </li>).
- */
-function wp_register( $before = '<li>', $after = '</li>' ) {
-
-        if ( ! is_user_logged_in() ) {
-                if ( get_option('users_can_register') )
-                        $link = $before . '<a href="' . site_url('wp-login.php?action=register', 'login') . '">' . __('Register') . '</a>' . $after;
-                else
-                        $link = '';
-        } else {
-                $link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
-        }
-
-        echo apply_filters('register', $link);
-}
-
-/**
  * Theme container function for the 'wp_meta' action.
  *
  * The 'wp_meta' action can have several purposes, depending on how you use it,