Ticket #497: ticket-497.patch

bb-includes/cache.php

@@ -19 +19 @@
                         $bb_user_cache[$user_id] = $this->read_cache(BBPATH . 'bb-cache/bb_user-' . $user_id);
                         return $bb_user_cache[$user_id];
                 else :
-                        if ( $user = $bbdb->get_row("SELECT * FROM $bbdb->users WHERE ID = $user_id AND user_status % 2 = 0") ) :
+                        if ( $user = $bbdb->get_row("SELECT * FROM $bbdb->users WHERE ID = $user_id") ) :
                                 bb_append_meta( $user, 'user' );
                         else :
                                 $bb_user_cache[$user_id] = false;
@@ -61 +61 @@
                         endif;
                 elseif ( 0 < count($ids) ) :
                         $sids = join(',', $ids);
-                        if ( $users = $bbdb->get_results("SELECT * FROM $bbdb->users WHERE ID IN ($sids) AND user_status % 2 = 0") )
+                        if ( $users = $bbdb->get_results("SELECT * FROM $bbdb->users WHERE ID IN ($sids)") )
                                 bb_append_meta( $users, 'user' );
                 endif;
 

bb-includes/pluggable.php

@@ -20 +20 @@
         $user = user_sanitize( $user );
         if ( !$already_md5 ) {
                 $pass = user_sanitize( md5( $pass ) );
-                return $bbdb->get_row("SELECT * FROM $bbdb->users WHERE user_login = '$user' AND SUBSTRING_INDEX( user_pass, '---', 1 ) = '$pass'");
+                return $bbdb->get_row("SELECT * FROM $bbdb->users WHERE user_login = '$user' AND SUBSTRING_INDEX( user_pass, '---', 1 ) = '$pass' AND user_status % 2 = 0");
         } else {
-                return $bbdb->get_row("SELECT * FROM $bbdb->users WHERE user_login = '$user' AND MD5( user_pass ) = '$pass'");
+                return $bbdb->get_row("SELECT * FROM $bbdb->users WHERE user_login = '$user' AND MD5( user_pass ) = '$pass' AND user_status % 2 = 0");
         }
 }
 endif;

bb-templates/profile-edit.php

@@ -62 +62 @@
 <?php endforeach; endif; ?>
 <tr>
   <th scope="row"><?php _e('Delete user:'); ?></th>
-  <td><label for="user_status"><input type="checkbox" name="user_status" id="user_status" value="1" /> <?php _e('Check to delete user.  This cannot be easily undone.'); ?></label>
+  <td><label for="user_status"><input type="checkbox" name="user_status" id="user_status" value="1" <?php echo (1 == $user->user_status) ? 'checked' : '';?> /> <?php _e('Check to delete user.  This cannot be easily undone.'); ?></label>
   </td>
 </tr>
 </table>

search.php

@@ -7 +7 @@
 if ( !empty( $q ) ) :
 
 if ( strlen( preg_replace('/[^a-z0-9]/i', '', $q) ) > 2 ) {
-        $users = $bbdb->get_results("SELECT * FROM $bbdb->users WHERE user_login LIKE ('%$likeit%')");
+        $users = $bbdb->get_results("SELECT * FROM $bbdb->users WHERE user_login LIKE ('%$likeit%') AND user_status % 2 = 0");
         if ( $users )
                 bb_append_meta( $users, 'user' );
 }