merged from v3.31sp1

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / PAGEFACTORY.php

diff --git a/utf8/nucleus/libs/PAGEFACTORY.php b/utf8/nucleus/libs/PAGEFACTORY.php
index 3b953e9..73adef0 100755 (executable)
--- a/utf8/nucleus/libs/PAGEFACTORY.php
+++ b/utf8/nucleus/libs/PAGEFACTORY.php
@@ -12,8 +12,8 @@
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2007 The Nucleus Group
- * @version $Id: PAGEFACTORY.php,v 1.7 2007-02-04 06:28:46 kimitake Exp $
- * $NucleusJP: PAGEFACTORY.php,v 1.6 2006/07/12 07:11:47 kimitake Exp $
+ * @version $Id: PAGEFACTORY.php,v 1.9 2008-02-08 09:31:22 kimitake Exp $
+ * $NucleusJP: PAGEFACTORY.php,v 1.8.2.2 2007/10/30 16:12:27 shizuki Exp $
  */
 
 /**
@@ -179,7 +179,7 @@ class PAGEFACTORY extends BaseActions {
        }
 
        function parse_bloglink() {
-               echo '<a href="'.htmlspecialchars($this->blog->getURL()).'">'.$this->blog->getName().'</a>';
+               echo '<a href="'.htmlspecialchars($this->blog->getURL()).'">'.htmlspecialchars($this->blog->getName()).'</a>';
        }
 
        function parse_authorname() {
@@ -259,7 +259,7 @@ class PAGEFACTORY extends BaseActions {
        }
 
        function parse_contents($which) {
-               echo htmlspecialchars($this->variables[$which]);
+               echo htmlspecialchars($this->variables[$which],ENT_QUOTES);
        }
 
        function parse_checkedonval($value, $name) {
@@ -340,9 +340,9 @@ class PAGEFACTORY extends BaseActions {
                        case "2":
                                echo '<div class="jsbuttonbar">';
 
-                                       $this->_jsbutton('bold',"boldThis()",'');
-                                       $this->_jsbutton('italic',"italicThis()",'');
-                                       $this->_jsbutton('link',"ahrefThis()",'');
+                                       $this->_jsbutton('bold',"boldThis()",_ADD_BOLD_TT);
+                                       $this->_jsbutton('italic',"italicThis()",_ADD_ITALIC_TT);
+                                       $this->_jsbutton('link',"ahrefThis()",_ADD_HREF_TT);
                                        $this->_jsbuttonspacer();
                                        $this->_jsbutton('alignleft',"alignleftThis()",_ADD_ALIGNLEFT_TT);
                                        $this->_jsbutton('alignright',"alignrightThis()",_ADD_ALIGNRIGHT_TT);