diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index f8ec67372..a34c4fc3b 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -293,6 +293,7 @@ user@yoursite.com {e_IMAGE}button.png 250 + sitecontactinfo English diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index eb8bccbe5..d817391d9 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -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 .= "
  • ".$tp->lanVars(TPVLAN_60, $data)."
  • "; } - $text .= " + $text .= ""; + + if(!empty($xmlArray['prefs']['core'])) + { + $text .= "

    ".LAN_PREFS.":

    "; + } + + $text .= "

    ".$tp->toHTML(TPVLAN_61, true)."

    diff --git a/e107_themes/bootstrap3/install/install.xml b/e107_themes/bootstrap3/install/install.xml index 42dad46a5..63f2ffd99 100644 --- a/e107_themes/bootstrap3/install/install.xml +++ b/e107_themes/bootstrap3/install/install.xml @@ -1,5 +1,8 @@ + + list + diff --git a/e107_themes/bootstrap5/install/install.xml b/e107_themes/bootstrap5/install/install.xml index a7e952a5b..df7ea0850 100644 --- a/e107_themes/bootstrap5/install/install.xml +++ b/e107_themes/bootstrap5/install/install.xml @@ -16,6 +16,8 @@ USA', 'hours' => '', 'message' => '', )]]> + list + %d %b %Y page diff --git a/e107_themes/voux/install/install.xml b/e107_themes/voux/install/install.xml index 910251afb..7059646c8 100644 --- a/e107_themes/voux/install/install.xml +++ b/e107_themes/voux/install/install.xml @@ -5,7 +5,7 @@ 'news.php', )]]> - + default 3 %d %b %Y {e_THEME}voux/install/logo2B252832529.png