X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=0fc8b8a6a3aae79a60dc1bf70459de1bde6bed01;hb=3c6d976d31c6af3d6a38453377ff45383347f4fe;hp=525d3509c17516f33efb52276eefba803db15d0b;hpb=0436782e70f496c96f30ee7822865f777ae1d73e;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 525d3509c1..0fc8b8a6a3 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -3,7 +3,7 @@
 require_once('include/attach.php');
 require_once('include/datetime.php');
 
-function wall_attach_post(&$a) {
+function wall_attach_post(App $a) {
 
 	$r_json = (x($_GET,'response') && $_GET['response']=='json');
 
@@ -112,24 +112,26 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	$r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
-		intval($page_owner_uid)
-	);
-
 	$limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
 
-	if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-		$msg = upgrade_message(true);
-		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
-		} else {
-			echo  $msg. EOL ;
+        if ($limit) {
+		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+			intval($page_owner_uid)
+		);
+		$size = $r[0]['total'];
+
+		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();
 	}
 
-
 	$filedata = @file_get_contents($src);
 	$mimetype = z_mime_content_type($filename);
 	$hash = get_guid(64);