Changeset 26120 for trunk/src/wp-signup.php

Timestamp:

11/13/2013 03:22:48 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Use get_current_site() instead of the $current_site global when possible.

props jeremyfelt.
fixes #25158.

File:

• trunk/src/wp-signup.php (modified) (5 diffs)

trunk/src/wp-signup.php

@@ -88 +88 @@
  * @param array $errors
  */
-function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
-    global $current_site;
+function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
+    $current_site = get_current_site();
     // Blog name
     if ( !is_subdomain_install() )
@@ -226 +226 @@
  * @param array $errors
  */
-function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
-    global $current_site;
+function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
     $current_user = wp_get_current_user();
 
@@ -259 +258 @@
     $errors = $filtered_results['errors'];
 
-    echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>';
+    echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
 
     if ( $errors->get_error_code() ) {
@@ -396 +395 @@
  * @param array $errors
  */
-function signup_user($user_name = '', $user_email = '', $errors = '') {
-    global $current_site, $active_signup;
+function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
+    global $active_signup;
 
     if ( !is_wp_error($errors) )
@@ -430 +429 @@
     ?>
 
-    <h2><?php printf( __( 'Get your own %s account in seconds' ), $current_site->site_name ) ?></h2>
+    <h2><?php printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name ) ?></h2>
     <form id="setupform" method="post" action="wp-signup.php">
         <input type="hidden" name="stage" value="validate-user-signup" />