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 committed 2012-02-08 09:35:45 +00:00
1 parent c6360df1e4
commit 63e87963e8
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/upgrade.php
+3 -2
View File
@@ -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>