Merge pull request #1 from friendica/develop

[friendica.git] / src / Module / Filer / SaveTag.php

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index f5d6115199a2ca007333212cab6da91ed21e0225..7f0da83bceaf12f017465199cbf116be4d50fd1d 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -14,7 +14,7 @@ use Friendica\Util\XML;
  */
 class SaveTag extends BaseModule
 {
-       public static function init()
+       public static function init(array $parameters = [])
        {
                if (!local_user()) {
                        info(L10n::t('You must be logged in to use this module'));
@@ -22,12 +22,12 @@ class SaveTag extends BaseModule
                }
        }
 
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
                $a = self::getApp();
                $logger = $a->getLogger();
 
-               $term = XML::unescape(trim(defaults($_GET, 'term', '')));
+               $term = XML::unescape(trim($_GET['term'] ?? ''));
                // @TODO: Replace with parameter from router
                $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
@@ -40,9 +40,8 @@ class SaveTag extends BaseModule
                }
 
                // return filer dialog
-               $filetags = PConfig::get(local_user(), 'system', 'filetags');
-               $filetags = Model\FileTag::fileToList($filetags, 'file');
-               $filetags = explode(",", $filetags);
+               $filetags = PConfig::get(local_user(), 'system', 'filetags', '');
+               $filetags = Model\FileTag::fileToArray($filetags);
 
                $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
                echo Renderer::replaceMacros($tpl, [