Changeset 34603

Timestamp:

09/26/2015 07:48:57 PM (10 years ago)

Author:

wonderboymusic

Message:

After [34577], alter wp_xmlrpc_server::mw_newMediaObject() to check upload space in multisite.

See #21292.

Location:

trunk/src/wp-includes

Files:

• class-wp-xmlrpc-server.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -5722 +5722 @@
         }
 
+        if ( is_multisite() && upload_is_user_over_quota( false ) ) {
+            $this->error = new IXR_Error( 401, __( 'Sorry, you have used your space allocation.' ) );
+            return $this->error;
+        }
+
         /**
          * Filter whether to preempt the XML-RPC media upload.

trunk/src/wp-includes/ms-functions.php

@@ -2373 +2373 @@
  */
 function get_upload_space_available() {
-    $space_allowed = get_space_allowed() * 1024 * 1024;
+    $allowed = get_space_allowed();
+    if ( $allowed < 0 ) {
+        $allowed = 0;
+    }
+    $space_allowed = $allowed * 1024 * 1024;
     if ( get_site_option( 'upload_space_check_disabled' ) )
         return $space_allowed;