Merge "Problems with image gallery and file/folder selection Bug 1236128" into 1.6_STABLE

77bc838d · Son Nguyen · Gerrit Code Review · 092cb585 · 7bda07eb · 77bc838d
Commit 77bc838d authored Oct 25, 2013 by Son Nguyen Committed by Gerrit Code Review Oct 25, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

htdocs/artefact/file/form/elements/filebrowser.php htdocs/artefact/file/form/elements/filebrowser.php +2 -1

No files found.
--- a/htdocs/artefact/file/form/elements/filebrowser.php
+++ b/htdocs/artefact/file/form/elements/filebrowser.php
@@ -102,7 +102,8 @@ function pieform_element_filebrowser(Pieform $form, $element) {
            if (!empty($value)) {
                foreach ($value as $k => $v) {
                    $file = artefact_instance_from_id($v);
-                    if (!($file instanceof ArtefactTypeFile) || !$USER->can_publish_artefact($file)) {
+                    if ((!($file instanceof ArtefactTypeFile) && !($file instanceof ArtefactTypeFolder))
+                        || !$USER->can_publish_artefact($file)) {
                        unset($value[$k]);
                    }
                }