1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +02:00

Issue #6, Fix for duplicate LAN_IP, PHP 7.1 fixes. Fix for CLI failing when SSL is enabled, but command is using 'http'. Allow cURL to follow redirects, preventing broken feeds under certain circumstances.

This commit is contained in:
Cameron
2016-12-16 12:13:52 -08:00
parent 851106707f
commit 67e0b43734
7 changed files with 18 additions and 10 deletions

View File

@@ -1027,7 +1027,7 @@ class xmlClass
/**
* Import an e107 XML file into site preferences and DB tables
*
* @param path $file - e107 XML file path
* @param string $file - e107 XML file path
* @param string $mode[optional] - add|replace
* @param boolean $noLogs [optional] tells pref handler to disable admin logs when true (install issues)
* @param boolean $debug [optional]
@@ -1114,6 +1114,12 @@ class xmlClass
{
$error = $sql->getLastErrorText();
$lastQry = $sql->getLastQuery();
if(is_array($lastQry))
{
$lastQry = $lastQry['PREPARE'];
}
$ret['failed'][] = $table. "\n[".$error."]\n".$lastQry."\n\n";
}
}