Merge pull request #643 from Shagshag/patch-2

[*] BO :ProductDownload::getNewFilename() avoid recursion
2013-08-12 00:29:33 -07:00
parent a38fe5ddd3 ce20d55e77
commit b7232aabd7
1 changed files with 5 additions and 5 deletions
@@ -299,10 +299,10 @@ class ProductDownloadCore extends ObjectModel
 	 */
 	public static function getNewFilename()
 	{
-		$ret = sha1(microtime());
-		if (file_exists(_PS_DOWNLOAD_DIR_.$ret))
-			$ret = ProductDownload::getNewFilename();
-		return $ret;
+		do {
+			$filename = sha1(microtime());
+		} while (file_exists(_PS_DOWNLOAD_DIR_.$filename));
+		return $filename;
 	}

 	/**
@@ -314,4 +314,4 @@ class ProductDownloadCore extends ObjectModel
 	{
 		return Configuration::get('PS_VIRTUAL_PROD_FEATURE_ACTIVE');
 	}
-}
+}