From 114cede50c13ab3982ac56224116bcf55b7cb1d4 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 12 Apr 2015 11:47:49 -0700
Subject: [PATCH] Issue #927 - Changed loading order of e_frontpage.

---
 e107_admin/frontpage.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index bdc181415..c9474205a 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -49,23 +49,28 @@ if($sql->db_Select('page', 'page_id, page_title', "menu_name=''")) // TODO Move
 }
 
 // Now let any plugins add to the options - must append to the $front_page array as above
-if(varset($frontPref['e_frontpage_list'])) // v1.x spec.
-{
-	foreach($frontPref['e_frontpage_list'] as $val)
+
+
+	//v2.x spec. ----------
+	$new = e107::getAddonConfig('e_frontpage');
+	foreach($new as $k=>$v)
 	{
-		if(is_readable(e_PLUGIN.$val.'/e_frontpage.php'))
+		$front_page[$k] = $v;
+	}
+
+	// v1.x spec.---------------
+	if(!empty($frontPref['e_frontpage_list']))
+	{
+		foreach($frontPref['e_frontpage_list'] as $val)
 		{
-			require_once (e_PLUGIN.$val.'/e_frontpage.php');
+			if(is_readable(e_PLUGIN.$val.'/e_frontpage.php'))
+			{
+				require_once (e_PLUGIN.$val.'/e_frontpage.php');
+			}
 		}
 	}
-}
 
-//v2.x spec.
-$new = e107::getAddonConfig('e_frontpage');
-foreach($new as $k=>$v)
-{
-	$front_page[$k] = $v;
-}
+
 
 
 // Make sure links relative to SITEURL