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

// now upgrade result has result=error when only php errors happens, thanks to Vincent Grimaud

Browse Source
This commit is contained in:
mMarinetti
2012-02-08 09:35:45 +00:00
parent c6360df1e4
commit 63e87963e8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/upgrade.php
+6 -5
View File
@@ -91,10 +91,10 @@ if (defined('_PS_ROOT_DIR_') AND !defined('_PS_MODULE_DIR_'))
elseif (!defined('_PS_MODULE_DIR_')) elseif (!defined('_PS_MODULE_DIR_'))
define('_PS_MODULE_DIR_', _PS_INSTALL_PATH_.'/../modules/'); define('_PS_MODULE_DIR_', _PS_INSTALL_PATH_.'/../modules/');
if(!defined('_PS_INSTALLER_PHP_UPGRADE_DIR_')) if (!defined('_PS_INSTALLER_PHP_UPGRADE_DIR_'))
define('_PS_INSTALLER_PHP_UPGRADE_DIR_', _PS_INSTALL_PATH_.'upgrade/php/'); define('_PS_INSTALLER_PHP_UPGRADE_DIR_', _PS_INSTALL_PATH_.'upgrade/php/');
if(!defined('_PS_INSTALLER_SQL_UPGRADE_DIR_')) if (!defined('_PS_INSTALLER_SQL_UPGRADE_DIR_'))
define('_PS_INSTALLER_SQL_UPGRADE_DIR_', _PS_INSTALL_PATH_.'upgrade/sql/'); define('_PS_INSTALLER_SQL_UPGRADE_DIR_', _PS_INSTALL_PATH_.'upgrade/sql/');
@@ -322,10 +322,11 @@ if (empty($fail_result))
} }
if ((is_array($phpRes) AND !empty($phpRes['error'])) OR $phpRes === false ) if ((is_array($phpRes) AND !empty($phpRes['error'])) OR $phpRes === false )
{ {
$warningExist = true;
$logger->logError('PHP error: '.$query."\r\n".(empty($phpRes['msg'])?'':' - '.$phpRes['msg'])); $logger->logError('PHP error: '.$query."\r\n".(empty($phpRes['msg'])?'':' - '.$phpRes['msg']));
$logger->logError(empty($phpRes['error'])?'':$phpRes['error']); $logger->logError(empty($phpRes['error'])?'':$phpRes['error']);
$requests .= $requests .= '
' <request result="fail" sqlfile="'.$version.'"> <request result="fail" sqlfile="'.$version.'">
<sqlQuery><![CDATA['.htmlentities($query).']]></sqlQuery> <sqlQuery><![CDATA['.htmlentities($query).']]></sqlQuery>
<phpMsgError><![CDATA['.(empty($phpRes['msg'])?'':$phpRes['msg']).']]></phpMsgError> <phpMsgError><![CDATA['.(empty($phpRes['msg'])?'':$phpRes['msg']).']]></phpMsgError>
<phpNumberError><![CDATA['.(empty($phpRes['error'])?'':$phpRes['error']).']]></phpNumberError> <phpNumberError><![CDATA['.(empty($phpRes['error'])?'':$phpRes['error']).']]></phpNumberError>
@@ -337,7 +338,7 @@ if (empty($fail_result))
<sqlQuery><![CDATA['.htmlentities($query).']]></sqlQuery> <sqlQuery><![CDATA['.htmlentities($query).']]></sqlQuery>
</request>'."\n"; </request>'."\n";
} }
elseif(!Db::getInstance()->execute($query)) elseif (!Db::getInstance()->execute($query))
{ {
$logger->logError('SQL query: '."\r\n".$query); $logger->logError('SQL query: '."\r\n".$query);
$logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError()); $logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError());