Ticket #28351: 28351-2.diff

src/wp-signup.php

@@ -109 +109 @@
                         $site = $current_site->domain . $current_site->path . __( 'sitename' );
                 else
                         $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
-                echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+                echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . apply_filters( 'signup_blogname_text', __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) ) . '</p>';
         }
 
         // Blog Title
@@ -179 +179 @@
                 echo '<p class="error">'.$errmsg.'</p>';
         }
         echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="60" /><br />';
-        _e( '(Must be at least 4 characters, letters and numbers only.)' );
+        echo apply_filters( 'signup_username_text', __( '(Must be at least 4 characters, letters and numbers only.)' ) );
         ?>
 
         <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
@@ -186 +186 @@
         <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
                 <p class="error"><?php echo $errmsg ?></p>
         <?php } ?>
-        <input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
+        <input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php apply_filters( 'signup_email_text', __('We send your registration email to this address. (Double-check your email address before continuing.)') ) ?>
         <?php
         if ( $errmsg = $errors->get_error_message('generic') ) {
                 echo '<p class="error">' . $errmsg . '</p>';
@@ -493 +493 @@
  * @param string $user_name The username
  * @param string $user_email The user's email address
  */
-function confirm_user_signup($user_name, $user_email) {
-        ?>
-        <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2>
-        <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
-        <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ); ?></p>
-        <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
-        <?php
+function confirm_user_signup( $user_name, $user_email ) {
+        $message = 
+        "<h2>" . sprintf( __( '%s is your new username' ), $user_name ) . "</h2>
+        <p>" . _( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) . "</p>
+        <p>" . sprintf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ) . "</p>
+        <p>" . _( 'If you do not activate your username within two days, you will have to sign up again.' ) . "</p>";
+        
+        /** 
+         * Filter the user signup confirmation message 
+         * 
+         * @since 4.2
+         * 
+         * @param string $message The default message
+         * @param string $user_name The username 
+         * @param string $user_email The user's email address 
+         */ 
+        echo apply_filters( 'confirm_user_signup', $message, $user_name, $user_email ); 
+
         /** This action is documented in wp-signup.php */
         do_action( 'signup_finished' );
 }
@@ -622 +633 @@
  * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
  */
 function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
-        ?>
-        <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+        $message =
+        "<h2>" . sprintf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) . "</h2>
+        <p>" . _( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) . "</p>
+        <p>" . sprintf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email ) . "</p>
+        <p>" . _( 'If you do not activate your site within two days, you will have to sign up again.' ) . "</p>
+        <h2>" . _( 'Still waiting for your email?' ) . "</h2>
+        <p>" .
+                _( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' )
+                . "<ul id='noemail-tips'>
+                        <li><p><strong>" . _( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) . "</strong></p></li>
+                        <li><p>" . _( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) . "</p></li>
+                        <li>" . sprintf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) . "</li>
+                </ul>
+        </p>";
 
-        <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
-        <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></p>
-        <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
-        <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
-        <p>
-                <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
-                <ul id="noemail-tips">
-                        <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
-                        <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-                        <li><?php printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
-                </ul>
-        </p>
-        <?php
+        /**
+         * Filter the blog signup confirmation message 
+         * 
+         * @since 4.2 
+         * 
+         * @param string $message The domain URL 
+         * @param string $domain The domain URL
+         * @param string $path The site root path 
+         * @param string $blog_title The new site title 
+         * @param string $user_name, The username 
+         * @param string $user_email The user's email address 
+         * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup() 
+         */
+        echo apply_filters( 'confirm_blog_signup', $message, $domain, $path, $blog_title, $user_name, $user_email, $meta ); 
         /** This action is documented in wp-signup.php */
         do_action( 'signup_finished' );
 }

tests/phpunit/includes/testcase.php

@@ -353 +353 @@
 
                 $this->flush_cache();
                 unset($GLOBALS['wp_query'], $GLOBALS['wp_the_query']);
-                $GLOBALS['wp_the_query'] = new WP_Query();
+        $GLOBALS['wp_the_query'] = new WP_Query();
                 $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
                 $GLOBALS['wp'] = new WP();
                 _cleanup_query_vars();