Changeset 12826

Timestamp:

01/25/2010 10:01:43 PM (15 years ago)

Author:

ryan

Message:

phpdoc and cleanup. see #11644

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (9 diffs)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-admin/includes/ms.php

@@ -1 +1 @@
 <?php
+
+/**
+ * Determine if uploaded file exceeds space quota.
+ *
+ * @since 3.0
+ *
+ * @param array $file $_FILES array for a given file.
+ * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
+ */
 function check_upload_size( $file ) {
-    if ( get_site_option( 'upload_space_check_disabled' ) ) {
+    if ( get_site_option( 'upload_space_check_disabled' ) )
         return $file;
-    }
+
     if ( $file['error'] != '0' ) // there's already an error
         return $file;
@@ -28 +37 @@
 add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
 
+/**
+ * Delete a blog
+ *
+ * @since 3.0
+ *
+ * @param int $blog_id Blog ID
+ * @param bool $drop True if blog's table should be dropped.  Default is false.
+ * @return void
+ */
 function wpmu_delete_blog($blog_id, $drop = false) {
     global $wpdb;
@@ -41 +59 @@
 
     // Remove users from this blog.
-    if ( !empty($users) ) foreach ($users as $user) {
-        remove_user_from_blog($user->user_id, $blog_id);
+    if ( !empty($users) ) {
+        foreach ($users as $user) {
+            remove_user_from_blog($user->user_id, $blog_id);
+        }
     }
 
@@ -62 +82 @@
         $index = 0;
 
-        while ($index < count($stack)) {
+        while ( $index < count($stack) ) {
             # Get indexed directory from stack
             $dir = $stack[$index];
 
             $dh = @ opendir($dir);
-            if ($dh) {
-                while (($file = @ readdir($dh)) !== false) {
+            if ( $dh ) {
+                while ( ($file = @ readdir($dh)) !== false ) {
                     if ($file == '.' or $file == '..')
                         continue;
@@ -82 +102 @@
 
         $stack = array_reverse($stack);  // Last added dirs are deepest
-        foreach( (array) $stack as $dir) {
+        foreach( (array) $stack as $dir ) {
             if ( $dir != $top_dir)
             @rmdir($dir);
@@ -90 +110 @@
     $blogs = get_site_option( "blog_list" );
     if ( is_array( $blogs ) ) {
-        foreach( $blogs as $n => $blog ) {
-            if ( $blog[ 'blog_id' ] == $blog_id ) {
+        foreach ( $blogs as $n => $blog ) {
+            if ( $blog[ 'blog_id' ] == $blog_id )
                 unset( $blogs[ $n ] );
-            }
         }
         update_site_option( 'blog_list', $blogs );
@@ -153 +172 @@
         if ( $val != '' && $val != '0' ) {
             $user = new WP_User( $val );
-            if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) {
+            if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
                 wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user->user_login ) );
-            }
             echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
             $blogs = get_blogs_of_user( $val, true );
@@ -165 +183 @@
                         echo "<select name='blog[$val][{$key}]'>";
                         $out = '';
-                        foreach( $blog_users as $user ) {
+                        foreach ( $blog_users as $user ) {
                             if ( $user->user_id != $val )
                                 $out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
@@ -265 +283 @@
             $user->ID = $current_user->ID;
             $user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
-            if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
+            if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
                 $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
-            }
             wp_update_user( get_object_vars( $user ) );
             delete_option( $current_user->ID . '_new_email' );

trunk/wp-includes/ms-functions.php

@@ -1609 +1609 @@
     $user_id = 0;
     if ( is_email( $string ) ) {
-        $user = get_user_by_email($string);
+        $user = get_user_by('email', $string);
         if ( $user )
             $user_id = $user->ID;
@@ -1615 +1615 @@
         $user_id = $string;
     } else {
-        $user = get_userdatabylogin($string);
+        $user = get_user_by('login', $string);
         if ( $user )
             $user_id = $user->ID;