diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index f5a6e7612..8e3627368 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -176,6 +176,7 @@
'social' => 'social',
'rss_menu' => 'rss_menu',
'user' => 'user',
+ 'gallery'=>'gallery',
)]]>
0
diff --git a/e107_tests/tests/acceptance/0000_InstallCest.php b/e107_tests/tests/acceptance/0000_InstallCest.php
index d4aeccb30..ed2c53c49 100644
--- a/e107_tests/tests/acceptance/0000_InstallCest.php
+++ b/e107_tests/tests/acceptance/0000_InstallCest.php
@@ -28,9 +28,10 @@ class InstallCest
$this->checkAdminButtonWelcomeMessage($I);
$this->testNoUpdatesRequired($I);
$this->checkTinyMceIsInstalled($I);
+ $this->checkBootstrap5Navigation($I);
}
-
+/*
public function installBootstrap3(AcceptanceTester $I)
{
$I->wantTo("Install e107 with bootstrap3");
@@ -45,7 +46,7 @@ class InstallCest
$I->see("United States");
$I->see("Blue");
- }
+ }*/
public function installVoux(AcceptanceTester $I)
{
@@ -180,6 +181,18 @@ class InstallCest
$I->see("Paste as text by default");
}
+ private function checkBootstrap5Navigation(AcceptanceTester $I)
+ {
+ $I->amOnPage('/article-1');
+ $I->see('Chapter 1','a');
+
+ $I->amOnPage('/gallery/gallery-1');
+ $I->see('horse');
+
+ $I->amOnPage('/terms-of-use');
+ $I->see('Terms of Use','.breadcrumb-item');
+ }
+
private function checkAdminButtonWelcomeMessage(AcceptanceTester $I)
{
diff --git a/e107_themes/bootstrap5/install/install.xml b/e107_themes/bootstrap5/install/install.xml
index 2b57a565d..9d877de3a 100644
--- a/e107_themes/bootstrap5/install/install.xml
+++ b/e107_themes/bootstrap5/install/install.xml
@@ -16,7 +16,7 @@ USA',
'hours' => '',
'message' => '',
)]]>
- 253
+ 253
0
list
255
diff --git a/install.php b/install.php
index 0599ba862..eb4e56846 100644
--- a/install.php
+++ b/install.php
@@ -1781,10 +1781,11 @@ if($this->pdo == true)
// Install Theme-required plugins
if(vartrue($this->previous_steps['install_plugins']) && ($themeInfo = $this->get_theme_xml($this->previous_steps['prefs']['sitetheme'])) && isset($themeInfo['plugins']['plugin']))
{
+ $themeName = $this->previous_steps['prefs']['sitetheme'];
foreach($themeInfo['plugins']['plugin'] as $k=>$plug)
{
$this->install_plugin($plug['@attributes']['name']);
- installLog::add('Theme-related plugin installed: '.$plug['@attributes']['name']);
+ installLog::add('Theme-related ('.$themeName.') plugin installed: '.$plug['@attributes']['name']);
}
}