From 3d456b8c08619217d3d447b4fc8b5909129b55b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 21 Feb 2013 15:24:33 +0100 Subject: [PATCH] // small fix --- classes/ConfigurationTest.php | 2 +- classes/Connection.php | 2 -- classes/PaymentCC.php | 9 --------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php index 4ee01a859..fa9c6a0b8 100644 --- a/classes/ConfigurationTest.php +++ b/classes/ConfigurationTest.php @@ -294,7 +294,7 @@ class ConfigurationTestCore return ConfigurationTest::test_dir($dir); } - public static function test_mcrypt() + public static function test_mbstring() { return function_exists('mb_strtolower'); } diff --git a/classes/Connection.php b/classes/Connection.php index 437518d87..19d6d6376 100644 --- a/classes/Connection.php +++ b/classes/Connection.php @@ -70,8 +70,6 @@ class ConnectionCore extends ObjectModel */ public function getFields() { - if (!$this->id_shop) - $this->id_shop = Context::getContext()->shop->id; if (!$this->id_shop_group) $this->id_shop_group = Context::getContext()->shop->id_shop_group; diff --git a/classes/PaymentCC.php b/classes/PaymentCC.php index 9b71663fe..5e258ecfc 100644 --- a/classes/PaymentCC.php +++ b/classes/PaymentCC.php @@ -53,15 +53,6 @@ class PaymentCCCore extends OrderPayment 'primary' => 'id_payment_cc', ); - /** - * @deprecated 1.5.0.2 - * @see OrderPaymentCore - */ - public function getFields() - { - Tools::displayAsDeprecated(); - return parent::getFields(); - } /** * @deprecated 1.5.0.2