src build elFinder-2.1-a685b2e

This commit is contained in:
nao-pon
2017-11-22 18:01:17 +09:00
parent 87bbd3f314
commit ab9a509bda
6 changed files with 12 additions and 9 deletions
+5 -2
View File
@@ -3088,7 +3088,9 @@ abstract class elFinderVolumeDriver {
$url = false;
if (! $maxSize) {
$args = elFinder::$currentArgs;
$maxSize = $args['substitute'];
if (! empty($args['substitute'])) {
$maxSize = $args['substitute'];
}
}
if ($maxSize) {
if ($this->getOption('substituteImg')) {
@@ -3835,7 +3837,8 @@ abstract class elFinderVolumeDriver {
if ($size = getimagesize($work)) {
$size['dimensions'] = $size[0].'x'.$size[1];
$srcfp = fopen($work, 'rb');
if ($subImgLink = $this->getSubstituteImgLink(elFinder::$currentArgs['target'], $size, $srcfp)) {
$cArgs = elFinder::$currentArgs;
if (!empty($cArgs['target']) && $subImgLink = $this->getSubstituteImgLink($cArgs['target'], $size, $srcfp)) {
$size['url'] = $subImgLink;
}
}