From a64f187a77fd7412edce01661e5480828b26ca8e Mon Sep 17 00:00:00 2001 From: Kevin Jakob Date: Tue, 15 Feb 2022 17:13:35 +0100 Subject: [PATCH 1/2] refactor: Removed the only remaining usage of deprecated global translation function. --- lib/Varien/Io/Sftp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Varien/Io/Sftp.php b/lib/Varien/Io/Sftp.php index b7c4afe0956..72c4f9f217c 100644 --- a/lib/Varien/Io/Sftp.php +++ b/lib/Varien/Io/Sftp.php @@ -53,7 +53,7 @@ class Varien_Io_Sftp extends Varien_Io_Abstract implements Varien_Io_Interface * @param string $args[username] Remote username * @param string $args[password] Connection password * @param int $args[timeout] Connection timeout [=10] - * + * @throws Exception */ public function open(array $args = array()) { @@ -68,7 +68,7 @@ public function open(array $args = array()) } $this->_connection = new phpseclib\Net\SFTP($host, $port, $args['timeout']); if (!$this->_connection->login($args['username'], $args['password'])) { - throw new Exception(sprintf(__("Unable to open SFTP connection as %s@%s", $args['username'], $args['host']))); + throw new Exception(sprintf('Unable to open SFTP connection as %s@%s', $args['username'], $args['host'])); } } From 4872b5db6e5223fafc6e9d6168892ada84cdef18 Mon Sep 17 00:00:00 2001 From: Kevin Jakob Date: Tue, 15 Feb 2022 17:13:50 +0100 Subject: [PATCH 2/2] refactor: Removed deprecated global translation function. --- app/code/core/Mage/Core/functions.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index e89340fd068..15ac40faa78 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -39,17 +39,6 @@ function destruct($object) unset($object); } -/** - * Translator function - * - * @return string - * @deprecated 1.3 - */ -function __() -{ - return Mage::app()->getTranslator()->translate(func_get_args()); -} - /** * Tiny function to enhance functionality of ucwords *