admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

src build elFinder-2.1-f12ace0

Browse Source
This commit is contained in:
nao-pon
2018-05-02 17:54:49 +09:00
parent a9ec39cd90
commit f02e1ebf43
10 changed files with 92 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeMySQL.class.php
+5 -1
View File
@@ -322,6 +322,11 @@ class elFinderVolumeMySQL extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function doSearch($path, $q, $mimes) {
if (!empty($this->doSearchCurrentQuery['matchMethod'])) {
// has custom match method use elFinderVolumeDriver::doSearch()
return parent::doSearch($path, $q, $mimes);
}
$dirs = array();
$timeout = $this->options['searchTimeout']? $this->searchStart + $this->options['searchTimeout'] : 0;
@@ -401,7 +406,6 @@ class elFinderVolumeMySQL extends elFinderVolumeDriver {
}
}
}
debug($result);
return $result;
}