From efb6dd0b9673bb4d516efa171c3a49e7d1d06573 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 6 Apr 2022 18:22:35 -0700
Subject: [PATCH] SEF URLs can now by available directly after installation.
 Removed debug info from News pagination. Disabled news_months_menu in default
 install config.

---
 e107_core/xml/default_install.xml                  |  2 +-
 e107_plugins/news/templates/news_view_template.php |  4 ++--
 install.php                                        | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 58fe13526..f5a6e7612 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -1110,7 +1110,7 @@
 			<item>
 				<field name="menu_id">14</field>
 				<field name="menu_name">news_months_menu</field>
-				<field name="menu_location">1</field>
+				<field name="menu_location">0</field>
 				<field name="menu_order">2</field>
 				<field name="menu_class">0</field>
 				<field name="menu_pages"></field>
diff --git a/e107_plugins/news/templates/news_view_template.php b/e107_plugins/news/templates/news_view_template.php
index 47b91cd70..3c32f32df 100644
--- a/e107_plugins/news/templates/news_view_template.php
+++ b/e107_plugins/news/templates/news_view_template.php
@@ -110,6 +110,6 @@ $NEWS_VIEW_TEMPLATE['default']['item'] = '
 
 
 // Navigation/Pagination
-$NEWS_VIEW_TEMPLATE['nav']['previous'] = '<a rel="prev" href="{NEWS_URL}">{GLYPH=fa-chevron-left}<span class="mx-1">{NEWS_TITLE} {NEWS_ID}</span></a>';
+$NEWS_VIEW_TEMPLATE['nav']['previous'] = '<a rel="prev" href="{NEWS_URL}">{GLYPH=fa-chevron-left}<span class="mx-1">{NEWS_TITLE}</span></a>';
 $NEWS_VIEW_TEMPLATE['nav']['current'] = '<a class="text-center" href="{NEWS_NAV_URL}">{LAN=BACK}</a>';
-$NEWS_VIEW_TEMPLATE['nav']['next'] = '<a rel="next" class="text-right" href="{NEWS_URL}"><span class="mx-1">{NEWS_ID} {NEWS_TITLE}</span>{GLYPH=fa-chevron-right}</a> ';
+$NEWS_VIEW_TEMPLATE['nav']['next'] = '<a rel="next" class="text-right" href="{NEWS_URL}"><span class="mx-1">{NEWS_TITLE}</span>{GLYPH=fa-chevron-right}</a> ';
diff --git a/install.php b/install.php
index aa3d0e975..0599ba862 100644
--- a/install.php
+++ b/install.php
@@ -1838,11 +1838,19 @@ if($this->pdo == true)
 		$url_modules = eRouter::adminReadModules();
 		$url_locations = eRouter::adminBuildLocations($url_modules);
 		$url_config = eRouter::adminBuildConfig(array(), $url_modules);
-		
+
 		$this->previous_steps['prefs']['url_aliases']		= array();
-		$this->previous_steps['prefs']['url_config']		= $url_config;
+
+		if(empty($pref['url_config']))
+		{
+			$this->previous_steps['prefs']['url_config']	= $url_config;
+		}
+
 		$this->previous_steps['prefs']['url_modules']		= $url_modules;
+
 		$this->previous_steps['prefs']['url_locations']		= $url_locations;
+
+
 		eRouter::clearCache();
 		installLog::add('Core URL config set to default state');
 
@@ -2004,6 +2012,8 @@ if($this->pdo == true)
 	 */
 	function get_themes()
 	{
+		return ['bootstrap5', 'voux'];
+
 		$handle = opendir($this->e107->e107_dirs['THEMES_DIRECTORY']);
 		$themelist = array();
 		while ($file = readdir($handle))