dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ProductDownload.php
+6 -9
View File
@@ -141,7 +141,7 @@ class ProductDownloadCore extends ObjectModel
*
* @return boolean
*/
static public function checkWritableDir()
public static function checkWritableDir()
{
return is_writable(_PS_DOWNLOAD_DIR_);
}
@@ -157,12 +157,10 @@ class ProductDownloadCore extends ObjectModel
if (array_key_exists($id_product, self::$_productIds))
return self::$_productIds[$id_product];
$data = Db::getInstance()->getRow('
self::$_productIds[$id_product] = (int)Db::getInstance()->getValue('
SELECT `id_product_download`
FROM `'._DB_PREFIX_.'product_download`
WHERE `id_product` = '.(int)($id_product).' AND `active` = 1');
self::$_productIds[$id_product] = isset($data['id_product_download']) ? (int)($data['id_product_download']) : false;
WHERE `id_product` = '.(int)$id_product.' AND `active` = 1');
return self::$_productIds[$id_product];
}
@@ -175,12 +173,11 @@ class ProductDownloadCore extends ObjectModel
*/
public static function getFilenameFromIdProduct($id_product)
{
$data = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `physically_filename`
FROM `'._DB_PREFIX_.'product_download`
WHERE `id_product` = '.(int)($id_product).'
WHERE `id_product` = '.(int)$id_product.'
AND `active` = 1');
return $data['physically_filename'];
}
/**
@@ -259,7 +256,7 @@ class ProductDownloadCore extends ObjectModel
*
* @return string Sha1 unique filename
*/
static public function getNewFilename()
public static function getNewFilename()
{
$ret = sha1(microtime());
if (file_exists(_PS_DOWNLOAD_DIR_.$ret))