From de74c8d14fffe6517db698c151aebc6bb15723dd Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 22 Dec 2011 22:43:51 +0000 Subject: [PATCH] // Fix PS_CIPHER_ALGORITHM in new install --- install-new/models/install.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/install-new/models/install.php b/install-new/models/install.php index 20991298b..e399def85 100644 --- a/install-new/models/install.php +++ b/install-new/models/install.php @@ -67,10 +67,6 @@ class InstallModelInstall extends InstallAbstractModel return false; } - // If no mcrypt, do not use RIJNDAEL algorithm - if (!function_exists('mcrypt')) - Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'configuration` SET `value` = 0 WHERE `name` = \'PS_CIPHER_ALGORITHM\''); - return true; } @@ -370,8 +366,7 @@ class InstallModelInstall extends InstallAbstractModel Configuration::updateGlobalValue('PS_MAIL_SMTP_PORT', $data['smtp_port']); // Activate rijndael 128 encrypt algorihtm if mcrypt is activated - if (function_exists('mcrypt_encrypt')) - Configuration::updateGlobalValue('PS_CIPHER_ALGORITHM', 1); + Configuration::updateGlobalValue('PS_CIPHER_ALGORITHM', function_exists('mcrypt_encrypt') ? 1 : 0); // Set logo configuration if (file_exists(_PS_IMG_DIR_.'logo.jpg'))