Merge remote-tracking branch 'refs/remotes/origin/hotfixes' into stable

GetSimpleCMS · Oct 10, 2016 · c2e710d · c2e710d
2 parents acc0fee + 8ebb288
commit c2e710d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/admin/inc/configuration.php b/admin/inc/configuration.php
@@ -7,7 +7,7 @@
  */
 
 $site_full_name     = 'GetSimple';
-$site_version_no    = '3.3.12';
+$site_version_no    = '3.3.13';
 $name_url_clean     = lowercase(str_replace(' ','-',$site_full_name));
 $ver_no_clean       = str_replace('.','',$site_version_no);
 $site_link_back_url = 'http://get-simple.info/';

diff --git a/admin/upload-uploadify.php b/admin/upload-uploadify.php
@@ -48,11 +48,9 @@
 			// invalid file
 		}
 
-		$path = (isset($_POST['path'])) ? $_POST['path']."/" : "";
-		$thumbsPath = GSTHUMBNAILPATH.$path;
-
+		$path = (isset($_POST['path'])) ? $_POST['path']."/" : "";			
 		require('inc/imagemanipulation.php');	
-		genStdThumb(isset($_POST['path']) ? $_POST['path']."/" : '',$name);	
+		genStdThumb(isset($_POST['path']) ? $_POST['path']."/" : '',$name.'.'.$extension);	
 
 		die('1');
 		// success