Changeset 29206 for trunk/src/wp-admin/includes/user.php

Timestamp:

07/17/2014 09:13:53 AM (11 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in wp-admin-directory files.

See #28931.

File:

• trunk/src/wp-admin/includes/user.php (modified) (4 diffs)

trunk/src/wp-admin/includes/user.php

@@ -391 +391 @@
 function default_password_nag_handler($errors = false) {
     global $user_ID;
-    if ( ! get_user_option('default_password_nag') ) //Short circuit it.
+    // Short-circuit it.
+    if ( ! get_user_option('default_password_nag') )
         return;
 
-    //get_user_setting = JS saved UI setting. else no-js-fallback code.
+    // get_user_setting = JS saved UI setting. else no-js-fallback code.
     if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
         delete_user_setting('default_password_nag');
@@ -402 +403 @@
 
 add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
+
 /**
  * @since 2.8.0
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
-    if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
+    // Short-circuit it.
+    if ( ! get_user_option('default_password_nag', $user_ID) )
         return;
 
     $new_data = get_userdata($user_ID);
 
-    if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
+    // Remove the nag if the password has been changed.
+    if ( $new_data->user_pass != $old_data->user_pass ) {
         delete_user_setting('default_password_nag');
         update_user_option($user_ID, 'default_password_nag', false, true);
@@ -418 +422 @@
 
 add_action('admin_notices', 'default_password_nag');
+
 /**
  * @since 2.8.0
@@ -423 +428 @@
 function default_password_nag() {
     global $pagenow;
-    if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
+    // Short-circuit it.
+    if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
         return;