WordPress.org

Make WordPress Core

Ticket #28351: 28351.diff

File 28351.diff, 4.8 KB (added by MikeHansenMe, 6 years ago)

Updated based on previous patch but pass the original message into the filter

  • src/wp-signup.php

     
    493493 * @param string $user_name The username
    494494 * @param string $user_email The user's email address
    495495 */
    496 function confirm_user_signup($user_name, $user_email) {
    497         ?>
    498         <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2>
    499         <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
    500         <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ); ?></p>
    501         <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
    502         <?php
     496function confirm_user_signup( $user_name, $user_email ) {
     497        $message =
     498        "<h2>" . sprintf( __( '%s is your new username' ), $user_name ) . "</h2>
     499        <p>" . _( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) . "</p>
     500        <p>" . sprintf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ) . "</p>
     501        <p>" . _( 'If you do not activate your username within two days, you will have to sign up again.' ) . "</p>";
     502       
     503        /**
     504         * Filter the user signup confirmation message
     505         *
     506         * @since 4.2
     507         *
     508         * @param string $message The default message
     509         * @param string $user_name The username
     510         * @param string $user_email The user's email address
     511         */
     512        echo apply_filters( 'confirm_user_signup', $message, $user_name, $user_email );
     513
    503514        /** This action is documented in wp-signup.php */
    504515        do_action( 'signup_finished' );
    505516}
     
    622633 * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
    623634 */
    624635function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
    625         ?>
    626         <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
     636        $message =
     637        "<h2>" . sprintf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) . "</h2>
     638        <p>" . _( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) . "</p>
     639        <p>" . sprintf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email ) . "</p>
     640        <p>" . _( 'If you do not activate your site within two days, you will have to sign up again.' ) . "</p>
     641        <h2>" . _( 'Still waiting for your email?' ) . "</h2>
     642        <p>" .
     643                _( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' )
     644                . "<ul id='noemail-tips'>
     645                        <li><p><strong>" . _( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) . "</strong></p></li>
     646                        <li><p>" . _( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) . "</p></li>
     647                        <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>
     648                </ul>
     649        </p>";
    627650
    628         <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
    629         <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></p>
    630         <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
    631         <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
    632         <p>
    633                 <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
    634                 <ul id="noemail-tips">
    635                         <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>
    636                         <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
    637                         <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>
    638                 </ul>
    639         </p>
    640         <?php
     651        /**
     652         * Filter the blog signup confirmation message
     653         *
     654         * @since 4.2
     655         *
     656         * @param string $message The domain URL
     657         * @param string $domain The domain URL
     658         * @param string $path The site root path
     659         * @param string $blog_title The new site title
     660         * @param string $user_name, The username
     661         * @param string $user_email The user's email address
     662         * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
     663         */
     664        echo apply_filters( 'confirm_blog_signup', $message, $domain, $path, $blog_title, $user_name, $user_email, $meta );
    641665        /** This action is documented in wp-signup.php */
    642666        do_action( 'signup_finished' );
    643667}