diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 23:32:16 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 23:32:16 -0400 |
| commit | afe7f09b278bca546f606a6ce54707a853cddf47 (patch) | |
| tree | ad54ff6a49e503a0218a301ef8e362fb6e08c6ea /mod/filer.php | |
| parent | c0a18bc2fad021db026141b732b3e9a1e0ce1d71 (diff) | |
| parent | d509a463452585bcbb9fccd07857871ca5c8b063 (diff) | |
| download | volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.gz volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.tar.bz2 volse-hubzilla-afe7f09b278bca546f606a6ce54707a853cddf47.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
correct some filer dialog weirdness caused by introduction of categories
move alert box away from nav links
log disabled requests
fix config storage of booleans
* master:
Diffstat (limited to 'mod/filer.php')
| -rwxr-xr-x | mod/filer.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/filer.php b/mod/filer.php index 3cd1bfe22..c0cca9e6d 100755 --- a/mod/filer.php +++ b/mod/filer.php @@ -22,7 +22,8 @@ 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("Save to Folder:"), '', '', $filetags, t('- select -')), |