src build elFinder-2.1-f12ace0

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
+2 -2
View File
@@ -1165,8 +1165,8 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Naoki Sawada
**/
protected function doSearch($path, $q, $mimes) {
if ($this->encoding || ! class_exists('FilesystemIterator', false)) {
// non UTF-8 use elFinderVolumeDriver::doSearch()
if (!empty($this->doSearchCurrentQuery['matchMethod']) || $this->encoding || ! class_exists('FilesystemIterator', false)) {
// has custom match method or non UTF-8, use elFinderVolumeDriver::doSearch()
return parent::doSearch($path, $q, $mimes);
}