From 9e8aa916b2e77bb0ceb2549cc7ac6a1fab602a7f Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Wed, 19 Nov 2008 16:38:45 +0000
Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=9E=98=EB=8B=9B.=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B6=80=20=EB=AF=B8=ED=88=AC=EB=AC=B8=EB=B2=95=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=20=20*=20...=20->=20=E2=80=A6=20=20=20*=20--=20->?=
 =?UTF-8?q?=20=E2=80=94?=
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@4917 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/planet/planet.controller.php | 2 ++
 modules/planet/planet.model.php      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/planet/planet.controller.php b/modules/planet/planet.controller.php
index b47205546..22715aa5d 100644
--- a/modules/planet/planet.controller.php
+++ b/modules/planet/planet.controller.php
@@ -124,6 +124,8 @@
         function insertContent($obj,$manual_inserted=false){
 
             $obj->content = str_replace(array('<','>'),array('&lt;','&gt;'),$obj->content);
+            $obj->content = str_replace('...', '…', $obj->content);
+            $obj->content = str_replace('--', '—', $obj->content);
             $obj->content = preg_replace('/"([^"]*)":(http|ftp|https|mms)([^ ]+)/is','<a href="$2$3" onclick="window.open(this.href);return false;">$1</a>$4', $obj->content);
             $oDocumentController = &getController('document');
             $output = $oDocumentController->insertDocument($obj,$manual_inserted);
diff --git a/modules/planet/planet.model.php b/modules/planet/planet.model.php
index 5aff5018c..15cf1099d 100644
--- a/modules/planet/planet.model.php
+++ b/modules/planet/planet.model.php
@@ -543,6 +543,8 @@
             if($output->data) {
                 foreach($output->data as $key => $val) {
                     $output->data[$key]->content = preg_replace('/"([^"]*)":(http|ftp|https|mms)([^ ]+)/is','<a href="$2$3" onclick="window.open(this.href);return false;">$1</a>$4', $val->content);
+                    $output->data[$key]->content = str_replace('...', '…', $output->data[$key]->content);
+                    $output->data[$key]->content = str_replace('--', '—', $output->data[$key]->content);
 
                 }
             }