From 548961c5abb7bd918c2339e460179c5cbcbe1b04 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 3 Feb 2019 09:51:16 -0800
Subject: [PATCH] Issue #3655 Revert order change. Generate filetypes.xml
 during install.

---
 e107_admin/admin.php |  6 +++---
 install.php          | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 4c1f24186..16c0f313c 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -172,6 +172,9 @@ class admin_start
 		e107::getDb()->db_Mark_Time('Check Incompatible Plugins');
 		$this->checkIncompatiblePlugins();
 
+		e107::getDb()->db_Mark_Time('Check Filetypes');
+		$this->checkFileTypes();
+
 		e107::getDb()->db_Mark_Time('Check Suspect Files');
 		$this->checkSuspiciousFiles();
 
@@ -187,9 +190,6 @@ class admin_start
 		e107::getDb()->db_Mark_Time('Check Core Update');
 		$this->checkCoreUpdate();
 
-		e107::getDb()->db_Mark_Time('Check Filetypes');
-		$this->checkFileTypes();
-
 		if($this->exit === true)
 		{
 			return null;
diff --git a/install.php b/install.php
index 8074303af..c3230d12b 100644
--- a/install.php
+++ b/install.php
@@ -1460,6 +1460,7 @@ if($this->pdo == true)
 		$this->template->SetTag("bartype", 'success');
 	
 		$htaccessError = $this->htaccess();
+		$this->saveFileTypes();
 
 		$e_forms->start_form("confirmation", "index.php");
 
@@ -1493,6 +1494,18 @@ if($this->pdo == true)
 		e107::getMessage()->reset(false, false, true);
 	}
 
+	private function saveFileTypes()
+	{
+		$data = '<?xml version="1.0" encoding="utf-8"?>
+<e107Filetypes>
+	<class name="253" type="zip,gz,jpg,jpeg,png,gif,xml,pdf" maxupload="2M" />
+</e107Filetypes>';
+
+		return file_put_contents($this->e107->e107_dirs['SYSTEM_DIRECTORY']."filetypes.xml",$data);
+
+	}
+
+
 
 	protected function stats()
 	{