htmlsc(): Just sugar for htmlspecialchars(), and a foundation

[pukiwiki/pukiwiki.git] / plugin / navi.inc.php

diff --git a/plugin/navi.inc.php b/plugin/navi.inc.php
index 5aeefcb..47545c4 100644 (file)
--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: navi.inc.php,v 1.22 2005/04/02 06:33:39 henoheno Exp $
+// $Id: navi.inc.php,v 1.24 2011/01/25 15:01:01 henoheno Exp $
 //
 // Navi plugin: Show DocBook-like navigation bar and contents
 
@@ -59,12 +59,12 @@ function plugin_navi_convert()
                $is_home = ($home == $current);
                if (! is_page($home)) {
                        return '#navi(contents-page-name): No such page: ' .
-                               htmlspecialchars($home) . '<br />';
+                               htmlsc($home) . '<br />';
                } else if (! $is_home &&
                    ! preg_match('/^' . preg_quote($home, '/') . '/', $current)) {
-                       return '#navi(' . htmlspecialchars($home) .
+                       return '#navi(' . htmlsc($home) .
                                '): Not a child page like: ' .
-                               htmlspecialchars($home . '/' . basename($current)) .
+                               htmlsc($home . '/' . basename($current)) .
                                '<br />';
                }
                $reverse = (strtolower($reverse) == 'reverse');
@@ -128,7 +128,7 @@ function plugin_navi_convert()
                        foreach (array('start'=>$home, 'next'=>$next,
                            'prev'=>$prev, 'up'=>$up) as $rel=>$_page) {
                                if ($_page != '') {
-                                       $s_page = htmlspecialchars($_page);
+                                       $s_page = htmlsc($_page);
                                        $r_page = rawurlencode($_page);
                                        $head_tags[] = ' <link rel="' .
                                                $rel . '" href="' . $script .
@@ -148,7 +148,7 @@ function plugin_navi_convert()
                        return '#navi(contents-page-name): You already view the result<br />';
                } else if ($count == 1) {
                        // Sentinel only: Show usage and warning
-                       $home = htmlspecialchars($home);
+                       $home = htmlsc($home);
                        $ret .= '#navi(' . $home . '): No child page like: ' .
                                $home . '/Foo';
                } else {