mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 23:26:41 +02:00
Code Issues Releases Wiki Activity

Don't re-install theme during upgrade unless data is missing.

Browse Source
This commit is contained in:
Cameron
2013-05-25 22:30:10 -07:00
parent 6b29610927
commit 784d386c36
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/includes/infopanel.php
View File

@@ -670,8 +670,9 @@ EOF;
if(file_exists(e_PLUGIN."awstats/awstats.graph.php")) if(file_exists(e_PLUGIN."awstats/awstats.graph.php"))
{ {
require_once(e_PLUGIN."awstats/awstats.graph.php"); require_once(e_PLUGIN."awstats/awstats.graph.php");
$stat = new awstats;
if($data) if($data = $stat->getData())
{ {
return $data; return $data;
} }

20
e107_admin/update_routines.php
View File

@@ -1604,15 +1604,19 @@ function update_706_to_800($type='')
if (!$just_check) // Running the Upgrade Process. if (!$just_check) // Running the Upgrade Process.
{ {
$th = e107::getSingleton('themeHandler');
$tmp = $th->getThemeInfo($pref['sitetheme']); if(!is_array($pref['sitetheme_layouts']) || !vartrue($pref['sitetheme_deflayout']))
if($th->setTheme($pref['sitetheme'], false))
{ {
$log->addDebug("Updated SiteTheme prefs"); $th = e107::getSingleton('themeHandler');
} $tmp = $th->getThemeInfo($pref['sitetheme']);
else if($th->setTheme($pref['sitetheme'], false))
{ {
$log->addDebug("Couldn't update SiteTheme prefs"); $log->addDebug("Updated SiteTheme prefs");
}
else
{
$log->addDebug("Couldn't update SiteTheme prefs");
}
} }
$log->toFile('upgrade_v1_to_v2'); $log->toFile('upgrade_v1_to_v2');