From a901ad5f160c0c0b68e9ceb135cf439f2060a212 Mon Sep 17 00:00:00 2001
From: jhyeon1010 <cjh1010@xpressengine.com>
Date: Tue, 30 Dec 2014 18:06:34 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#1116=20=ED=8C=8C=EB=B9=84=EC=BD=98=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EA=B0=92=20=EC=A0=9C=EA=B1=B0=20=EB=B3=B5?=
 =?UTF-8?q?=EA=B5=AC,=20default=20option=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/display/HTMLDisplayHandler.php |  4 ++--
 modules/admin/admin.admin.model.php    | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index f463f56b1..cc61705da 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -219,8 +219,8 @@ class HTMLDisplayHandler
 
 		// set icon
 		$oAdminModel = getAdminModel('admin');
-		$favicon_url = $oAdminModel->getFaviconUrl();
-		$mobicon_url = $oAdminModel->getMobileIconUrl();
+		$favicon_url = $oAdminModel->getFaviconUrl(false);
+		$mobicon_url = $oAdminModel->getMobileIconUrl(false);
 		Context::set('favicon_url', $favicon_url);
 		Context::set('mobicon_url', $mobicon_url);
 
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index d5290ee3e..e1e613ed5 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -935,17 +935,17 @@ class adminAdminModel extends admin
 		return $output->data->count;
 	}
 
-	function getFaviconUrl()
+	function getFaviconUrl($default = true)
 	{
-		return $this->iconUrlCheck('favicon.ico', 'faviconSample.png');
+		return $this->iconUrlCheck('favicon.ico', 'faviconSample.png', $default);
 	}
 
-	function getMobileIconUrl()
+	function getMobileIconUrl($default = true)
 	{
-		return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png');
+		return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $default);
 	}
 
-	function iconUrlCheck($iconname, $default_icon_name)
+	function iconUrlCheck($iconname, $default_icon_name, $default)
 	{
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
@@ -955,7 +955,11 @@ class adminAdminModel extends admin
 		}
 
 		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if($file_exsit)
+		if(!$file_exsit && $default === true)
+        {
+            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+        }
+        elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;