Fix Attach model store() and storeFile()

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 523bd2be229bcd12eda6a514019fb6abf7134f49..40f82eef91271b191f21113de5c85ea0f61aa134 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,12 +6,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Attach;
 use Friendica\Model\Contact;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Mimetype;
 use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {

diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 2911136188d53b9ab2a492ea33f74c6690c3f817..48b034e4992d7a20f76fd04dd3170414234e2afe 100644 (file)
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.php
@@ -7,11 +7,13 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Core\System;
 use Friendica\Core\StorageManager;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Util\Security;
-
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Mimetype;
 
 /**
  * Class to handle attach dabatase table
@@ -156,8 +158,8 @@ class Attach extends BaseObject
         * @param string  $data  Binary data
         * @param integer $uid       User ID
         * @param string  $filename  Filename
-        * @param string  $filetype  Mimetype. optional
-        * @param integer $filesize  File size in bytes. optional
+        * @param string  $filetype  Mimetype. optional, default = ''
+        * @param integer $filesize  File size in bytes. optional, default = null
         * @param string  $allow_cid Permissions, allowed contacts. optional, default = ''
         * @param string  $allow_gid Permissions, allowed groups. optional, default = ''
         * @param string  $deny_cid  Permissions, denied contacts.optional, default = ''
@@ -165,13 +167,13 @@ class Attach extends BaseObject
         *
         * @return boolean/integer Row id on success, False on errors
         */
-       public function store($data, $uid, $filename, $filetype = '' , $filesize = -1, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
+       public function store($data, $uid, $filename, $filetype = '' , $filesize = null, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
        {
                if ($filetype === '') {
                        $filetype = Mimetype::getContentType($filename);
                }
 
-               if ($filesize < 0) {
+               if (is_null($filesize)) {
                        $filesize = strlen($data);
                }
 
@@ -206,6 +208,7 @@ class Attach extends BaseObject
                if ($r === true) {
                        return DBA::lastInsertId();
                }
+               return $r;
        }
 
        /**
@@ -221,7 +224,7 @@ class Attach extends BaseObject
 
                $data = @file_get_contents($src);
 
-               return  self::store($data, $uid, $filename, '', '', $allow_cid, $allow_gid,  $deny_cid, $deny_gid);
+               return  self::store($data, $uid, $filename, '', null, $allow_cid, $allow_gid,  $deny_cid, $deny_gid);
        }