Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eb2a92323ab0115b489e92bb371039d02b17e0f6..c789262c648b4175e018078f4d4798e41b091f50 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -166,21 +166,19 @@ function wall_upload_post(&$a, $desktopmode = true) {
                        intval($page_owner_uid)
                );
                $size = $r[0]['total'];
-       } else
-               $size = 0;
 
-       if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) {
-               $msg = upgrade_message(true);
-               if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
-               } else {
-                       echo  $msg. EOL;
+               if (($size + strlen($imagedata)) > $limit) {
+                       $msg = upgrade_message(true);
+                       if ($r_json) {
+                               echo json_encode(array('error'=>$msg));
+                       } else {
+                               echo  $msg. EOL;
+                       }
+                       @unlink($src);
+                       killme();
                }
-               @unlink($src);
-               killme();
        }
 
-
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);