Changeset 16527 for trunk/wp-admin/user-new.php

Timestamp:

11/21/2010 04:56:08 PM (14 years ago)

Author:

ryan

Message:

Notice fixes for user-new.php. Props wpdavis. see #15456

File:

• trunk/wp-admin/user-new.php (modified) (3 diffs)

trunk/wp-admin/user-new.php

@@ -16 +16 @@
     function admin_created_user_email( $text ) {
         /* translators: 1: Site name, 2: site URL, 3: role */
-        return sprintf( __( "Hi,
-You've been invited to join '%1$s' at
+        return sprintf( __( 'Hi,
+You\'ve been invited to join \'%1$s\' at
 %2$s as a %3$s.
 If you do not want to join this site please ignore
@@ -23 +23 @@
 
 Please click the following link to activate your user account:
-%%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
+%%s' ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
     }
     add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
@@ -109 +109 @@
             }
             wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-            if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+            if ( isset( $_POST[ 'adduser' ] ) && isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
                 $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
                 wpmu_activate_signup( $key );