Merge develop into 3011_hcard_vcard

[friendica.git] / mod / filer.php

diff --git a/mod/filer.php b/mod/filer.php
old mode 100755 (executable)
new mode 100644 (file)
index 8253784..4e79f33
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -11,8 +11,8 @@ function filer_content(&$a) {
                killme();
        }
 
-       $term = notags(trim($_GET['term']));
-       $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+       $term = unxmlify(trim($_GET['term']));
+       $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        logger('filer: tag ' . $term . ' item ' . $item_id);
 
@@ -22,10 +22,12 @@ function filer_content(&$a) {
        } else {
                // return filer dialog
                $filetags = get_pconfig(local_user(),'system','filetags');
-               $filetags = explode("][", trim($filetags,"[]"));
+               $filetags = file_tag_file_to_list($filetags,'file');
+                $filetags = explode(",", $filetags);
+
                $tpl = get_markup_template("filer_dialog.tpl");
                $o = replace_macros($tpl, array(
-                       '$field' => array('term', t("File as:"), '', '', $filetags, t('- select -')),
+                       '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
                        '$submit' => t('Save'),
                ));