fix image save

livestreet · Aug 1, 2014 · 7912b5a · 7912b5a
1 parent da3ff22
commit 7912b5a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/classes/modules/image/entity/Image.entity.class.php b/classes/modules/image/entity/Image.entity.class.php
@@ -256,9 +256,10 @@ public function save($sFile) {
 			return false;
 		}
 		try {
+			$sFormat=($this->getParam('format_auto') && $this->getFormat()) ? $this->getFormat() : $this->getParam('format');
 			$sFileTmp=Config::Get('path.tmp.server').DIRECTORY_SEPARATOR.func_generator(20);
 			$oImage->save($sFileTmp,array(
-				'format'=>$this->getParam('format'),
+				'format'=>$sFormat,
 				'quality'=>$this->getParam('quality'),
 			));
 
@@ -286,9 +287,10 @@ public function saveTmp() {
 			if (!is_dir($sDirTmp)) {
 				@mkdir($sDirTmp,0777,true);
 			}
+			$sFormat=($this->getParam('format_auto') && $this->getFormat()) ? $this->getFormat() : $this->getParam('format');
 			$sFileTmp=$sDirTmp.DIRECTORY_SEPARATOR.func_generator(20);
 			$oImage->save($sFileTmp,array(
-				'format'=>$this->getParam('format'),
+				'format'=>$sFormat,
 				'quality'=>$this->getParam('quality'),
 			));