From 82a833a60d1f3584aeca12a48e0cce4fb75c5e83 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 27 Feb 2015 15:19:52 +0900
Subject: [PATCH] =?UTF-8?q?#1087=20=EC=97=90=EB=94=94=ED=84=B0=20=EB=AF=B8?=
 =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20toolbarCanCollapse=20=EC=98=B5=EC=85=98?=
 =?UTF-8?q?=20=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/skins/ckeditor/editor.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index a6683dce3..8d0032ec9 100755
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -69,6 +69,7 @@
 		var ckconfig = {
 			height: '{$editor_height}',
 			bodyClass: 'xe_content editable',
+			toolbarCanCollapse: true,
 			toolbarGroups: [
 				{ name: 'clipboard',   groups: [ 'undo', 'clipboard' ] },
 				{ name: 'editing',     groups: [ 'find', 'selection' ] },
@@ -121,8 +122,8 @@
 	// uploader
 	$(function () {/**/
 		var setting = {
-			maxFileSize: {$file_config->allowed_filesize},
-			limitMultiFileUploadSize: {$file_config->allowed_filesize},
+			maxFileSize: {$file_config->allowed_filesize || 'null'},
+			limitMultiFileUploadSize: {$file_config->allowed_filesize || 'null'},
 		};
 		var uploader = $('#xe-uploader-container-{$editor_sequence}').xeUploader(setting);
 	});