"contact-id" has to be set, after "author-id" had been set

[friendica.git] / src / Model / Attach.php

diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 7efb56f95a03a87fcd38dc5823aa73b5de2a5883..0073a6ed3f52f9b2ab6cddf8be1aad23aaa23858 100644 (file)
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.php
@@ -7,15 +7,15 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use Friendica\Core\System;
 use Friendica\Core\StorageManager;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Storage\IStorage;
 use Friendica\Object\Image;
-use Friendica\Util\Security;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
+use Friendica\Util\Security;
 
 /**
  * Class to handle attach dabatase table
@@ -31,32 +31,31 @@ class Attach extends BaseObject
         */
        private static function getFields()
        {
-               $allfields = DBStructure::definition(false);
+               $allfields = DBStructure::definition(self::getApp()->getBasePath(), false);
                $fields = array_keys($allfields['attach']['fields']);
                array_splice($fields, array_search('data', $fields), 1);
                return $fields;
        }
 
        /**
-        * @brief Select rows from the attach table
+        * @brief Select rows from the attach table and return them as array
         *
         * @param array $fields     Array of selected fields, empty for all
         * @param array $conditions Array of fields for conditions
         * @param array $params     Array of several parameters
         *
-        * @return boolean|array
+        * @return array
         *
         * @throws \Exception
-        * @see   \Friendica\Database\DBA::select
+        * @see   \Friendica\Database\DBA::selectToArray
         */
-       public static function select(array $fields = [], array $conditions = [], array $params = [])
+       public static function selectToArray(array $fields = [], array $conditions = [], array $params = [])
        {
                if (empty($fields)) {
                        $fields = self::getFields();
                }
 
-               $r = DBA::select('attach', $fields, $conditions, $params);
-               return DBA::toArray($r);
+               return DBA::selectToArray('attach', $fields, $conditions, $params);
        }
 
        /**
@@ -264,7 +263,7 @@ class Attach extends BaseObject
        {
                if (!is_null($img)) {
                        // get items to update
-                       $items = self::select(['backend-class','backend-ref'], $conditions);
+                       $items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
                        foreach($items as $item) {
                                /** @var IStorage $backend_class */
@@ -297,7 +296,7 @@ class Attach extends BaseObject
        public static function delete(array $conditions, array $options = [])
        {
                // get items to delete data info
-               $items = self::select(['backend-class','backend-ref'], $conditions);
+               $items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
                foreach($items as $item) {
                        /** @var IStorage $backend_class */