mirror of
https://github.com/e107inc/e107.git
synced 2025-08-06 06:38:00 +02:00
Corrected theme install pref defaults. Theme Manager now prompting again about default content and display modified prefs when detected.
This commit is contained in:
@@ -293,6 +293,7 @@
|
||||
<core name="siteadminemail">user@yoursite.com</core>
|
||||
<core name="sitebutton">{e_IMAGE}button.png</core>
|
||||
<core name="sitecontacts">250</core>
|
||||
<core name="sitecontacts">sitecontactinfo</core>
|
||||
<core name="sitedescription"></core>
|
||||
<core name="sitedisclaimer"></core>
|
||||
<core name="sitelang_init">English</core>
|
||||
|
@@ -3163,15 +3163,17 @@ class themeHandler
|
||||
if($contentCheck === true)
|
||||
{
|
||||
$sql->delete("menus", "menu_layout !='' ");
|
||||
$this->installContentCheck($name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
e107::getCache()->clear();
|
||||
e107::getCache()->clearAll('js');
|
||||
e107::getCache()->clearAll('css');
|
||||
e107::getCache()->clearAll('library');
|
||||
e107::getCache()->clearAll('browser');
|
||||
|
||||
if($core->save())
|
||||
if($core->save(true,false,false))
|
||||
{
|
||||
$mes->addDebug("Default Layout: ".$deflayout);
|
||||
$mes->addDebug("Custom Pages: ".print_a($customPages,true));
|
||||
@@ -3180,10 +3182,7 @@ class themeHandler
|
||||
$med->import('_common_image', e_THEME.$name, "^.*?logo.*?(\.png|\.jpeg|\.jpg|\.JPG|\.GIF|\.PNG)$");
|
||||
$med->import('_common_image', e_THEME.$name, '', 'min-size=20000');
|
||||
|
||||
if($contentCheck === true)
|
||||
{
|
||||
$this->installContentCheck($name);
|
||||
}
|
||||
|
||||
|
||||
$this->theme_adminlog('01', $name.', style.css');
|
||||
|
||||
@@ -3235,7 +3234,19 @@ class themeHandler
|
||||
$text .= "<li>".$tp->lanVars(TPVLAN_60, $data)."</li>";
|
||||
}
|
||||
|
||||
$text .= "</ul>
|
||||
$text .= "</ul>";
|
||||
|
||||
if(!empty($xmlArray['prefs']['core']))
|
||||
{
|
||||
$text .= "<p>".LAN_PREFS.":</p><ul>";
|
||||
foreach($xmlArray['prefs']['core'] as $key=>$val)
|
||||
{
|
||||
$text .= "<li>".$val['@attributes']['name']."</li>";
|
||||
}
|
||||
$text .= "</ul>";
|
||||
}
|
||||
|
||||
$text .= "
|
||||
|
||||
<p>".$tp->toHTML(TPVLAN_61, true)."</p>
|
||||
|
||||
|
@@ -1,5 +1,8 @@
|
||||
<?xml version='1.0' encoding='utf-8' ?>
|
||||
<e107Export version="2.0.0 (git)" timestamp="1428087500" >
|
||||
<prefs>
|
||||
<core name="news_default_template">list</core>
|
||||
</prefs>
|
||||
<database>
|
||||
<dbTable name="generic">
|
||||
<item>
|
||||
|
@@ -16,6 +16,8 @@ USA',
|
||||
'hours' => '',
|
||||
'message' => '',
|
||||
)]]></core>
|
||||
<core name="news_default_template">list</core>
|
||||
<core name="shortdate">%d %b %Y</core>
|
||||
<core name="url_main_module">page</core>
|
||||
</prefs>
|
||||
<database>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
<core name="frontpage"><![CDATA[array (
|
||||
0 => 'news.php',
|
||||
)]]></core>
|
||||
|
||||
<core name="news_default_template">default</core>
|
||||
<core name="newsposts">3</core>
|
||||
<core name="shortdate">%d %b %Y</core>
|
||||
<core name="sitelogo">{e_THEME}voux/install/logo2B252832529.png</core>
|
||||
|
Reference in New Issue
Block a user