I flubbed the merge, doh

matthiasplappert · Jun 13, 2011 · cbb9162 · cbb9162
1 parent ba9285f
commit cbb9162
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Cloud/API.php b/Cloud/API.php
@@ -190,14 +190,11 @@ public function addFile($path) {
 
         // Request S3 data
         $s3 = $this->_execute('http://my.cl.ly/items/new');
-        if ($s3-> uploads_remaining < 1) {
-            throw new CloudException('Account has reached its maximum number of uploads for the day.', CLOUD_EXCEPTION_MAX_UPLOADS);
-        }
 
-		// Check if we can upload
-		if(isset($s3->num_remaining) && $s3->num_remaining < 1) {
-			throw new Cloud_Exception('Insufficient uploads remaining. Please consider upgrading to CloudApp Pro', CLOUD_EXCEPTION_PRO);
-		}
+        // Check if we can upload
+        if(isset($s3->num_remaining) && $s3->num_remaining < 1) {
+            throw new Cloud_Exception('Insufficient uploads remaining. Please consider upgrading to CloudApp Pro', CLOUD_EXCEPTION_PRO);
+        }
 
         // Create body and upload file
         $body = array();