regression fix several elFinder upload/paste issues

exponentcms · Feb 17, 2017 · 5c99deb · 5c99deb
1 parent 0d61249
commit 5c99deb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/framework/modules/file/connector/elFinderVolumeExponent.class.php b/framework/modules/file/connector/elFinderVolumeExponent.class.php
@@ -239,10 +239,10 @@ protected function _remove_expFile($oldpath)
      * @return array|false
      * @author Dave Leffler
      */
-    public function paste($volume, $src, $dst, $rmSrc = false)
+    public function paste($volume, $src, $dst, $rmSrc = false, $hashes = array())
     {
         $this->_move_expFile($src, $dst);
-        $result = parent::paste($volume, $src, $dst, $rmSrc);
+        $result = parent::paste($volume, $src, $dst, $rmSrc, $hashes);
         $this->_remove_expFile($src); // remove the duplicate expFile record pointing to old location
 
         $opath = $this->decode($src);

diff --git a/framework/modules/file/connector/elfinder.php b/framework/modules/file/connector/elfinder.php
@@ -35,6 +35,7 @@
 include BASE . 'external/elFinder/php/elFinderConnector.class.php';
 include BASE . 'external/elFinder/php/elFinder.class.php';
 
+include BASE . 'external/elFinder/php/elFinderPlugin.php';
 //include BASE . 'external/elFinder/php/libs/GdBmp.php';  // will also autoload if needed
 //include BASE . 'external/elFinder/php/plugins/AutoResize/plugin.php'; // will also autoload if needed
 //include BASE . 'external/elFinder/php/plugins/AutoRotate/plugin.php';
@@ -458,15 +459,15 @@ function validName($name)
                 'application/x-zip',
                 'application/x-zip-compressed',
                 'application/zip',
-                'audio/*',
-                'image/*',
+                'audio',
+                'image',
                 'multipart/x-gzip',
                 'multipart/x-zip',
                 'text/plain',
                 'text/rtf',
                 'text/richtext',
                 'text/xml',
-                'video/*',
+                'video',
                 'text/csv'
             ),
             'uploadDeny'      => array('application/x-shockwave-flash'),