From 40ab69f2259affa52e8b94a03f09e30feb9adc1a Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 28 Apr 2016 01:03:52 +0900
Subject: [PATCH] Always apply paragraph spacing, even if it is zero

---
 modules/editor/editor.controller.php      | 2 +-
 modules/editor/skins/ckeditor/editor.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 74f322fbf..801c53851 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -212,7 +212,7 @@ class editorController extends editor
 				$buff[] = 'word-break: ' . ($content_word_break ?: 'normal') . '; word-wrap: break-word;';
 			}
 			$buff[] = '}';
-			if ($content_paragraph_spacing) $buff[] = ".xe_content p { margin: 0 0 $content_paragraph_spacing 0; }";
+			$buff[] = '.xe_content p { margin: 0 0 ' . ($content_paragraph_spacing ?: 0) . ' 0; }';
 			$buff[] = '</style>';
 			Context::addHtmlHeader(implode(' ', $buff));
 		}
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index 1e04ea5d6..6cf59d145 100755
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -21,7 +21,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 	<block cond="$content_word_break === 'none'">{@ $css_content .= 'white-space: nowrap;';}</block>
 	<block cond="$content_word_break !== 'none'">{@ $css_content .= 'word-break:' . ($content_word_break ?: 'normal') . '; word-wrap: break-word;';}</block>
 	{@ $css_content .= chr(125);}
-	<block cond="$content_paragraph_spacing">{@ $css_content .= '.xe_content.editable p { margin: 0 0 ' . $content_paragraph_spacing . ' 0;' . chr(125);}</block>
+	{@ $css_content .= '.xe_content.editable p { margin: 0 0 ' . ($content_paragraph_spacing ?: 0) . ' 0;' . chr(125);}
 <!--@endif-->
 
 <!--@if($enable_autosave)-->