catching nulls for FileTag

diff --git a/include/text.php b/include/text.php
index eb65334fd94e72469c33ee7a2b31ca36a8e15c7c..e4227cd7d09f57632043bae8dda3cf4282c71450 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -186,7 +186,7 @@ function get_cats_and_terms($item)
        $folders = [];
        $first = true;
 
-       foreach (FileTag::fileToArray($item['file'], 'category') as $savedFolderName) {
+       foreach (FileTag::fileToArray($item['file'] ?? '', 'category') as $savedFolderName) {
                $categories[] = [
                        'name' => $savedFolderName,
                        'url' => "#",
@@ -202,7 +202,7 @@ function get_cats_and_terms($item)
        }
 
        if (local_user() == $item['uid']) {
-               foreach (FileTag::fileToArray($item['file']) as $savedFolderName) {
+               foreach (FileTag::fileToArray($item['file'] ?? '') as $savedFolderName) {
                        $folders[] = [
                                'name' => $savedFolderName,
                                'url' => "#",

diff --git a/mod/item.php b/mod/item.php
index 7af5c712f6b3bbf59fdf4705fa5f9516344ade4a..b064bbce8e8a318d591ed5830754fd8b39027612 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -27,12 +27,12 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\Attach;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
-use Friendica\Model\Attach;
 use Friendica\Model\Term;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
@@ -337,7 +337,7 @@ function item_post(App $a) {
        $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category');
        $categories_new = $categories;
 
-       if (!empty($filedas)) {
+       if (!empty($filedas) && is_array($filedas)) {
                // append the fileas stuff to the new categories list
                $categories .= FileTag::arrayToFile($filedas);
        }

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index c743cb127827946ebcc03b163044a7e02d9a8f63..f4d04634fa78e1a5037e1b64c3660c4ee802cee8 100644 (file)
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -133,7 +133,7 @@ class FileTag
         * @return string       A list of file tags.
         * @deprecated since 2019.06 use arrayToFile() instead
         */
-       public static function listToFile($list, $type = 'file')
+       public static function listToFile(string $list, string $type = 'file')
        {
                $list_array = explode(',', $list);
 
@@ -150,7 +150,7 @@ class FileTag
         * @return string       Comma delimited list of tag names.
         * @deprecated since 2019.06 use fileToArray() instead
         */
-       public static function fileToList($file, $type = 'file')
+       public static function fileToList(string $file, $type = 'file')
        {
                return implode(',', self::fileToArray($file, $type));
        }
@@ -166,7 +166,7 @@ class FileTag
         * @return boolean          A value indicating success or failure.
         * @throws \Exception
         */
-       public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
+       public static function updatePconfig(int $uid, string $file_old, string $file_new, string $type = 'file')
        {
                if (!intval($uid)) {
                        return false;

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index aeafdbeb5905a379f8e5482805549930b5e37a3a..08ff1a32d04545c763f060aaef8f495e118b19f4 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -40,7 +40,7 @@ class SaveTag extends BaseModule
                }
 
                // return filer dialog
-               $filetags = PConfig::get(local_user(), 'system', 'filetags');
+               $filetags = PConfig::get(local_user(), 'system', 'filetags', '');
                $filetags = Model\FileTag::fileToArray($filetags);
 
                $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");