Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x

ghnat · Sep 11, 2012 · f4cbafb · f4cbafb
2 parents 6638eae + 323bce8
commit f4cbafb
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -2712,31 +2712,31 @@ protected function createTmb($path, $stat) {
 			return false;
 		}
 
-    	/* If image smaller or equal thumbnail size - just fitting to thumbnail square */
-    	if ($s[0] <= $tmbSize && $s[1]  <= $tmbSize) {
-     	   $result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
+    		/* If image smaller or equal thumbnail size - just fitting to thumbnail square */
+    		if ($s[0] <= $tmbSize && $s[1]  <= $tmbSize) {
+     	   		$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
+	    	} else {
 
-	    } else {
-
-	    	if ($this->options['tmbCrop']) {
+	    		if ($this->options['tmbCrop']) {
 
-        		/* Resize and crop if image bigger than thumbnail */
-	        	if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize) ) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
-    				$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, false, 'png');
-	        	}
+        			/* Resize and crop if image bigger than thumbnail */
+	        		if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize) ) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
+    					$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, false, 'png');
+	        		}
 
 				if (($s = getimagesize($tmb)) != false) {
 					$x = $s[0] > $tmbSize ? intval(($s[0] - $tmbSize)/2) : 0;
 					$y = $s[1] > $tmbSize ? intval(($s[1] - $tmbSize)/2) : 0;
 					$result = $this->imgCrop($tmb, $tmbSize, $tmbSize, $x, $y, 'png');
 				}
 
-    		} else {
-        		$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, true, $this->imgLib, 'png');
-        		$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
-      		}
+    			} else {
+        			$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, true, $this->imgLib, 'png');
+      			}
 
+			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
 		}
+
 		if (!$result) {
 			unlink($tmb);
 			return false;