vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
props jeremyfelt.
fixes #25158.

git-svn-id: https://develop.svn.wordpress.org/trunk@26120 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2013-11-13 03:22:48 +00:00
parent f13e9a6796
commit 39d55fddb8
16 changed files with 54 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-signup.php
+7 -8
View File
@@ -87,8 +87,8 @@ do_action( 'before_signup_form' );
* @param string $blog_title The new site title
* @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() )
echo '<label for="blogname">' . __('Site Name:') . '</label>';
@@ -225,8 +225,7 @@ function validate_user_form() {
* @param string $blog_title The new blog title
* @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();
if ( ! is_wp_error($errors) ) {
@@ -258,7 +257,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
$blog_title = $filtered_results['blog_title'];
$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() ) {
echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
@@ -395,8 +394,8 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
* @param string $user_email The user's email
* @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) )
$errors = new WP_Error();
@@ -429,7 +428,7 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
?>
<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" />
<?php