Changeset 7271

Timestamp:

May 18, 2008, 7:37:31 PM (15 years ago)

Author:

ebihara

Message:

#2424:メール受信通知メールのタイトルおよび本文にhtmlspecialchars()がかかっていたのを修正

Location:

OpenPNE/trunk/webapp

Files:

• lib/smarty_plugins/modifier.t_truncate.php (modified) (2 diffs)
• templates/mail/m_ktai_message_zyushin.tpl (modified) (1 diff)

OpenPNE/trunk/webapp/lib/smarty_plugins/modifier.t_truncate.php

@@ -12 +12 @@
  * @param string $etc
  * @param int    $rows
+ * @param bool   $is_htmlspecialchars
  * @return string
  */
-function smarty_modifier_t_truncate($string, $width = 80, $etc = '', $rows = 1)
+function smarty_modifier_t_truncate($string, $width = 80, $etc = '', $rows = 1, $is_htmlspecialchars = true)
 {
     $rows = (int)$rows;
@@ -61 +62 @@
     $string = implode("\n", $result);
 
-    return nl2br(htmlspecialchars($string, ENT_QUOTES, 'UTF-8'));
+    if ($is_htmlspecialchars) {
+        $string = htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
+    }
+
+    return nl2br($string);
 }
 

OpenPNE/trunk/webapp/templates/mail/m_ktai_message_zyushin.tpl

@@ -8 +8 @@
 ({if $subject})
 件名:
-({$subject|t_truncate:50:"..."})
+({$subject|t_truncate:50:"...":1:0})
 ({/if})
 
 ({if $body})
 本文:
-({$body|t_truncate:150:"..."})
+({$body|t_truncate:150:"...":1:0})
 ({/if})