From 1a0661c1d69eb39873c4840846b6e519dea6a40e Mon Sep 17 00:00:00 2001
From: sejin7940 <sejin7940@nate.com>
Date: Fri, 11 Jul 2014 23:40:24 +0900
Subject: [PATCH] =?UTF-8?q?=20#840=20=EA=B4=80=EB=A6=AC=EC=9E=90=EC=9D=98?=
 =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0=20=EC=97=90=EB=94=94=ED=84=B0=20=EA=B6=8C?=
 =?UTF-8?q?=ED=95=9C=20=EC=84=A4=EC=A0=95=EC=97=90=20=EA=B4=80=EA=B3=84?=
 =?UTF-8?q?=EC=97=86=EC=9D=B4=20=ED=95=AD=EC=83=81=20=EC=9E=91=EB=8F=99?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/editor.model.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 551e02829..ded9da79c 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -379,7 +379,8 @@ class editorModel extends editor
 		$option->colorset = $config->sel_editor_colorset;
 		// Permission check for file upload
 		$option->allow_fileupload = false;
-		if(count($config->upload_file_grant))
+		if($logged_info->is_admin=='Y') $option->allow_fileupload = true;
+		elseif(count($config->upload_file_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -393,7 +394,8 @@ class editorModel extends editor
 		else $option->allow_fileupload = true;
 		// Permission check for using default components
 		$option->enable_default_component = false;
-		if(count($config->enable_default_component_grant))
+		if($logged_info->is_admin=='Y') $option->enable_default_component = true;
+		elseif(count($config->enable_default_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -407,7 +409,8 @@ class editorModel extends editor
 		else $option->enable_default_component = true;
 		// Permisshion check for using extended components
 		$option->enable_component = false;
-		if(count($config->enable_component_grant))
+		if($logged_info->is_admin=='Y') $option->enable_component = true;
+		elseif(count($config->enable_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -421,7 +424,8 @@ class editorModel extends editor
 		else $option->enable_component = true;
 		// HTML editing privileges
 		$enable_html = false;
-		if(count($config->enable_html_grant))
+		if($logged_info->is_admin=='Y') $option->enable_html = true;
+		elseif(count($config->enable_html_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{