Merge branch '2.x' into 2.1

This commit is contained in:
nao-pon
2015-01-23 16:05:44 +09:00
+1 -1
View File
@@ -416,7 +416,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _fopen($path, $mode='rb') {
return @fopen($path, 'r');
return @fopen($path, $mode);
}
/**