mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Installation default content fix. Added getperms() function in case something calls it.

Browse Source
This commit is contained in:
Cameron
2017-12-15 15:52:58 -08:00
parent ff2b79145e
commit de3318eb65
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_languages/English/lan_installer.php
View File

@@ -183,6 +183,6 @@ define("LANINS_142", "IMPORTANT: Please rename e107.htaccess to .htaccess");
define("LANINS_144", "IMPORTANT: Please copy and paste the contents of the [b]e107.htaccess[/b] into your [b].htaccess[/b] file. Please take care NOT to overwrite any existing data that may be in it."); define("LANINS_144", "IMPORTANT: Please copy and paste the contents of the [b]e107.htaccess[/b] into your [b].htaccess[/b] file. Please take care NOT to overwrite any existing data that may be in it.");
define("LANINS_145", "e107 v2.x requires the PHP [x] to be installed. Please contact your host or read the information at [y] before continuing."); define("LANINS_145", "e107 v2.x requires the PHP [x] to be installed. Please contact your host or read the information at [y] before continuing.");
define("LANINS_146", "Admin Area Skin"); define("LANINS_146", "Admin-area Skin");
define("LANINS_147", "Administration"); define("LANINS_147", "Administration");

22
install.php
View File

@@ -137,6 +137,11 @@ function check_class($whatever='')
return true; return true;
} }
function getperms($arg, $ap = '')
{
return true;
}
$override = array(); $override = array();
if(isset($_POST['previous_steps'])) if(isset($_POST['previous_steps']))
@@ -1608,7 +1613,7 @@ if($this->pdo == true)
$ret = e107::getXml()->e107Import($coreConfig, 'replace', true, false); // Add core pref values $ret = e107::getXml()->e107Import($coreConfig, 'replace', true, false); // Add core pref values
$this->logLine('Attempting to Write Core Prefs.'); $this->logLine('Attempting to Write Core Prefs.');
$this->logLine(print_r($ret, true)); $this->logLine(print_r($ret, true));
/*
if($XMLImportfile) // We cannot rely on themes to include all prefs..so use 'replace'. if($XMLImportfile) // We cannot rely on themes to include all prefs..so use 'replace'.
{ {
$ret2 = e107::getXml()->e107Import($XMLImportfile, 'replace', true, false); // Overwrite specific core pref and tables entries. $ret2 = e107::getXml()->e107Import($XMLImportfile, 'replace', true, false); // Overwrite specific core pref and tables entries.
@@ -1616,7 +1621,7 @@ if($this->pdo == true)
$this->logLine(print_r($ret2, true)); $this->logLine(print_r($ret2, true));
} }
//Create default plugin-table entries. */ //Create default plugin-table entries.
// e107::getConfig('core')->clearPrefCache(); // e107::getConfig('core')->clearPrefCache();
e107::getPlugin()->update_plugins_table('update'); e107::getPlugin()->update_plugins_table('update');
$this->logLine('Plugins table updated'); $this->logLine('Plugins table updated');
@@ -1637,9 +1642,20 @@ if($this->pdo == true)
} }
} }
e107::getSingleton('e107plugin')->save_addon_prefs('update'); // save plugin addon pref-lists. eg. e_latest_list. e107::getSingleton('e107plugin')->save_addon_prefs('update'); // save plugin addon pref-lists. eg. e_latest_list.
$this->logLine('Addon prefs saved'); $this->logLine('Addon prefs saved');
// do this AFTER any required plugins are installated.
if($XMLImportfile) // We cannot rely on themes to include all prefs..so use 'replace'.
{
$ret2 = e107::getXml()->e107Import($XMLImportfile, 'replace', true, false); // Overwrite specific core pref and tables entries.
$this->logLine('Attempting to write Theme Prefs/Tables (install.xml)');
$this->logLine(print_r($ret2, true));
}
$tm = e107::getSingleton('themeHandler'); $tm = e107::getSingleton('themeHandler');
$tm->noLog = true; // false to enable log $tm->noLog = true; // false to enable log
$tm->setTheme($this->previous_steps['prefs']['sitetheme'], false); $tm->setTheme($this->previous_steps['prefs']['sitetheme'], false);
@@ -1877,7 +1893,7 @@ if($this->pdo == true)
// require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php"); // require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php");
// $tm = new themeHandler; // $tm = new themeHandler;
$xmlArray = e107::getTheme($theme_folder,true)->get(); $xmlArray = e107::getTheme($theme_folder)->get();
return (is_array($xmlArray)) ? $xmlArray : false; return (is_array($xmlArray)) ? $xmlArray : false;
} }