From c0557966eca66fd7cbec3636cce0499511f93ceb Mon Sep 17 00:00:00 2001
From: Achim Ennenbach <achim@simsync.de>
Date: Tue, 28 Aug 2018 10:23:55 +0200
Subject: [PATCH] Moved new prefs from update_routines.php to
 default_install.xml

---
 e107_admin/update_routines.php    | 17 -----------------
 e107_core/xml/default_install.xml |  2 ++
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 6e12cd0b7..190fe0090 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -122,8 +122,6 @@ if (!$dont_check_update)
 	$LAN_UPDATE_4 = deftrue('LAN_UPDATE_4',"Update from [x] to [y]"); // in case language-pack hasn't been upgraded.
 	$LAN_UPDATE_5 = deftrue('LAN_UPDATE_5', "Core database structure");
 
-	$dbupdate['219_to_220'] = array('master'=>false, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.1.9','2.2.0')), 'message'=> null, 'hide_when_complete'=>true);
-
 	$dbupdate['218_to_219'] = array('master'=>false, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.1.8','2.1.9')), 'message'=> null, 'hide_when_complete'=>true);
 
 	$dbupdate['217_to_218'] = array('master'=>false, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.1.7','2.1.8')), 'message'=> null, 'hide_when_complete'=>true);
@@ -566,21 +564,6 @@ function update_core_database($type = '')
 }
 
 
-	function update_219_to_220($type='')
-	{
-		$sql = e107::getDb();
-		$just_check = ($type == 'do') ? false : true;
-
-		// add new pref contact_privacypolicy
-		if (!e107::getPref('contact_privacypolicy', ''))
-		{
-			e107::getConfig()->setPref('contact_privacypolicy', '')->save(false, true);
-		}
-
-		return $just_check;
-	}
-
-
 	function update_218_to_219($type='')
 	{
 		$sql = e107::getDb();
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 72b91c60e..bdfd35b67 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -149,6 +149,8 @@
 		<core name="frontpage_force"><![CDATA[array (
   0 => '',
 )]]></core>
+		<core name="gdpr_privacypolicy"></core>
+		<core name="gdpr_termsandconditions"></core>
 		<core name="html_abuse">0</core>
 		<core name="im_height">80</core>
 		<core name="im_path">/usr/X11R6/bin/</core>