[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX] elfinder: Selecting a was file in trackers broken

Jonny Bradley pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
4432721f by Jonny Bradley at 2026-04-02T00:34:02+00:00
[FIX] elfinder: Selecting a was file in trackers broken
---
* [FIX] phpcs: Stupid rule

* [FIX] elfinder: MR !6530 changed the input to this "function" to use an array of hashes, but didn't then didn't change the function to treat that input as an array. It also neglected to change the  output even though the js handling it in files.tpl was changed in the same MR to only accept an array of file info arrays.
Low quality... and broken for over a year?

See merge request tikiwiki/tiki!9909


(cherry picked from commit 3e6cb513d7dbb7c2579bb2b723bf7eacf2611aff)

2f1aae59 [FIX] elfinder: MR !6530 changed the input to this "function" to use an array...
83431c13 [FIX] phpcs: Stupid rule

Co-authored-by: Jonny Bradley <[email protected]>
- - - - -


1 changed file:

- lib/core/Services/File/FinderController.php


Changes:

=====================================
lib/core/Services/File/FinderController.php
=====================================
@@ -194,7 +194,14 @@ class Services_File_FinderController
             if ($input->insertion_syntax->text()) {
                 $params['insertion_syntax'] = $input->insertion_syntax->text();
             }
-            return $this->getHashInfo($elFinder, $input->hash->word(), $params);
+            $hashes = $input->hash->asArray();
+            $fileInfos = [];
+
+            foreach ($hashes as $hash) {
+                $fileInfos[] = $this->getHashInfo($elFinder, $hash, $params);
+            }
+
+            return $fileInfos;
         } elseif ($input->cmd->text() === 'file') {
             // intercept download command and use tiki-download_file so the mime type and extension is correct
             $fileId = $elFinder->realpath($input->target->text());



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4432721f3cdc6ebbe88e7460e79a3b0a840e9864

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4432721f3cdc6ebbe88e7460e79a3b0a840e9864
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs