Merge pull request #343 from PrestaShop/dev

Bump version 4.10.0
PrestaShop · Nov 22, 2019 · 1302047 · 1302047
2 parents 973fa1a + b201b1a
commit 1302047
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/autoupgrade.php b/autoupgrade.php
@@ -31,7 +31,7 @@ public function __construct()
         $this->name = 'autoupgrade';
         $this->tab = 'administration';
         $this->author = 'PrestaShop';
-        $this->version = '4.9.0';
+        $this->version = '4.10.0';
         $this->need_instance = 1;
 
         $this->bootstrap = true;

diff --git a/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php b/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php
@@ -328,8 +328,8 @@ protected function getUpgradeSqlFilesListToApply($upgrade_dir_sql, $oldversion)
      */
     protected function applySqlParams(array $sqlFiles)
     {
-        $search = array('PREFIX_', 'ENGINE_TYPE');
-        $replace = array(_DB_PREFIX_, (defined('_MYSQL_ENGINE_') ? _MYSQL_ENGINE_ : 'MyISAM'));
+        $search = array('PREFIX_', 'ENGINE_TYPE', 'DB_NAME');
+        $replace = array(_DB_PREFIX_, (defined('_MYSQL_ENGINE_') ? _MYSQL_ENGINE_ : 'MyISAM'), _DB_NAME_);
 
         $sqlRequests = array();
 
@@ -387,16 +387,20 @@ protected function runPhpQuery($upgrade_file, $query)
             if (!file_exists($this->pathToPhpUpgradeScripts . strtolower($func_name) . '.php')) {
                 $this->logger->error('[ERROR] ' . $upgrade_file . ' PHP - missing file ' . $query);
                 $this->container->getState()->setWarningExists(true);
-            } else {
-                require_once $this->pathToPhpUpgradeScripts . strtolower($func_name) . '.php';
-                $phpRes = call_user_func_array($func_name, $parameters);
+
+                return;
             }
+
+            require_once $this->pathToPhpUpgradeScripts . strtolower($func_name) . '.php';
+            $phpRes = call_user_func_array($func_name, $parameters);
         }
         // Or an object method
         else {
             $func_name = array($php[0], str_replace($pattern[0], '', $php[1]));
             $this->logger->error('[ERROR] ' . $upgrade_file . ' PHP - Object Method call is forbidden (' . $php[0] . '::' . str_replace($pattern[0], '', $php[1]) . ')');
             $this->container->getState()->setWarningExists(true);
+
+            return;
         }
 
         if (isset($phpRes) && (is_array($phpRes) && !empty($phpRes['error'])) || $phpRes === false) {

diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>autoupgrade</name>
 	<displayName><![CDATA[1-Click Upgrade]]></displayName>
-	<version><![CDATA[4.9.0]]></version>
+	<version><![CDATA[4.10.0]]></version>
 	<description><![CDATA[Provides an automated method to upgrade your shop to the latest version of PrestaShop.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[administration]]></tab>