From 06494b5ae5e73a8e8a33dd4d67f6da45ffe3d2b2 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 15 Oct 2007 11:04:07 +0000
Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=9A=A9=EA=B5=AC=20=EC=97=AC?=
 =?UTF-8?q?=EB=8B=AB=EB=8A=94=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EC=97=90=20<?=
 =?UTF-8?q?=3D=20=EC=99=80=20=EA=B0=99=EC=9D=80=20tag=20=EA=B0=80=20?=
 =?UTF-8?q?=EC=99=80=EB=8F=84=20=EA=B9=A8=EC=96=B4=EC=A7=80=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2775 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/components/quotation/quotation.class.php | 3 +++
 modules/editor/components/quotation/tpl/popup.js        | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/editor/components/quotation/quotation.class.php b/modules/editor/components/quotation/quotation.class.php
index 2e60de13d..00857a86c 100644
--- a/modules/editor/components/quotation/quotation.class.php
+++ b/modules/editor/components/quotation/quotation.class.php
@@ -75,6 +75,9 @@
             if($use_folder == "Y") {
                 $folder_id = rand(1000000,9999999);
 
+                $folder_opener = str_replace("&amp;","&",$folder_opener);
+                $folder_closer = str_replace("&amp;","&",$folder_closer);
+
                 if($bold == "Y") $class = "bold";
                 switch($color) {
                     case "red" :
diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js
index 73c24bf22..971c6050e 100644
--- a/modules/editor/components/quotation/tpl/popup.js
+++ b/modules/editor/components/quotation/tpl/popup.js
@@ -15,8 +15,8 @@ function getQuotation() {
     var use_folder = node.getAttribute("use_folder");
     var folder_opener = node.getAttribute("folder_opener");
     var folder_closer = node.getAttribute("folder_closer");
-    if(folder_opener) folder_opener = folder_opener.replace(/&amp;/g,'&').replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
-    if(folder_closer) folder_closer = folder_closer.replace(/&amp;/g,'&').replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
+    if(folder_opener) folder_opener = folder_opener.replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
+    if(folder_closer) folder_closer = folder_closer.replace(/&gt;/g,'>').replace(/&lt;/,'<').replace(/&quot;/,'"');
     var bold = node.getAttribute("bold");
     var color = node.getAttribute("color");
     var margin = node.getAttribute("margin");
@@ -86,8 +86,8 @@ function insertQuotation() {
     var folder_closer = xGetElementById("quotation_closer").value;
     if(!folder_opener||!folder_closer) use_folder = "N";
 
-    folder_opener = folder_opener.replace(/&/g,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
-    folder_closer = folder_closer.replace(/&/g,'&amp;').replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
+    folder_opener = folder_opener.replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
+    folder_closer = folder_closer.replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
 
     var bold = "N";
     if(xGetElementById("quotation_bold").checked) bold = "Y";