mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Fixes #3520 thump.php failing when custom site_path in use.

Browse Source
This commit is contained in:
Cameron
2018-11-07 16:31:08 -08:00
parent 12dece2cc6
commit 5073dcd3bb
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/e107_class.php
View File

@@ -385,12 +385,13 @@ class e107
$this->e107_config_mysql_info = $e107_config_mysql_info; $this->e107_config_mysql_info = $e107_config_mysql_info;
// unique folder for e_MEDIA - support for multiple websites from single-install. Must be set before setDirs() // unique folder for e_MEDIA - support for multiple websites from single-install. Must be set before setDirs()
if (!empty($e107_config_override['site_path'])) /* if (!empty($e107_config_override['site_path']))
{ {
// $E107_CONFIG['site_path'] // $E107_CONFIG['site_path']
$this->site_path = $e107_config_override['site_path']; $this->site_path = $e107_config_override['site_path'];
} }*/
else
if(empty($e107_config_override['site_path']))
{ {
$this->site_path = $this->makeSiteHash($e107_config_mysql_info['mySQLdefaultdb'], $e107_config_mysql_info['mySQLprefix']); $this->site_path = $this->makeSiteHash($e107_config_mysql_info['mySQLdefaultdb'], $e107_config_mysql_info['mySQLprefix']);
} }
@@ -457,6 +458,11 @@ class e107
*/ */
public function setDirs($e107_dirs, $e107_config_override = array()) public function setDirs($e107_dirs, $e107_config_override = array())
{ {
if(!empty($e107_config_override['site_path'])) // $E107_CONFIG['site_path']
{
$this->site_path = $e107_config_override['site_path'];
}
$override = array_merge((array) $e107_dirs, (array) $e107_config_override); $override = array_merge((array) $e107_dirs, (array) $e107_config_override);
// override all // override all