FIX:ブックマークレットから読み込む際にJavascriptでescapeされたテキストがデコードされずに編集画面に表示される問題を修正

diff --git a/nucleus/bookmarklet.php b/nucleus/bookmarklet.php
index acd0da1..89ccdfb 100644 (file)
--- a/nucleus/bookmarklet.php
+++ b/nucleus/bookmarklet.php
@@ -269,6 +269,8 @@ function bm_doShowForm()
        
        if ( $log_text )
        {
+               $log_text = preg_replace("/%u([0-9a-f]{3,4})/i","&#x$1;",urldecode($log_text));
+               $log_text = html_entity_decode($log_text, null, i18n::get_current_charset());
                $logje .= '<blockquote><div>"' . Entity::hsc($log_text) . '"</div></blockquote>' . "\n";
        }
        
@@ -276,6 +278,11 @@ function bm_doShowForm()
        {
                $log_linktitle = $log_link;
        }
+       else
+       {
+               $log_linktitle = preg_replace("/%u([0-9a-f]{3,4})/i","&#x$1;",urldecode($log_linktitle));
+               $log_linktitle = html_entity_decode($log_linktitle, null, i18n::get_current_charset());
+       }
        
        if ( $log_link )
        {