1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +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

@@ -518,7 +518,7 @@ $pref = e107::getPref();
$menu_pref = e107::getConfig('menu')->getPref(); //extract menu prefs
// NEW - force ssl
if(e107::getPref('ssl_enabled') && !deftrue('e_SSL_DISABLE'))
if(e107::getPref('ssl_enabled') && !deftrue('e_SSL_DISABLE') && empty($_E107['cli']))
{
// NOTE: e_SSL_DISABLE check is here to help webmasters fix 'ssl_enabled'
// if set by accident on site with no SSL support - just define it in e107_config.php