strip_link_wallを廃止

diff --git a/func.php b/func.php
index e90d56e..3850b18 100644 (file)
--- a/func.php
+++ b/func.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: func.php,v 1.11 2003/01/31 01:49:35 panda Exp $
+// $Id: func.php,v 1.12 2003/02/03 10:25:11 panda Exp $
 //
 
 // ʸ»úÎó¤¬InterWikiName¤«¤É¤¦¤«
@@ -220,9 +220,7 @@ function decode($key)
 // [[ ]] ¤ò¼è¤ê½ü¤¯
 function strip_bracket($str)
 {
-       global $strip_link_wall;
-       
-       if ($strip_link_wall and preg_match('/^\[\[(.*)\]\]$/',$str,$match)) {
+       if (preg_match('/^\[\[(.*)\]\]$/',$str,$match)) {
                $str = $match[1];
        }
        return $str;
@@ -285,12 +283,12 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
        }
        $retval .= "</ul>\n";
        if ($list_index and $cnt > 0) {
-               $top = "<div id=\"top\" style=\"text-align:center\">\n";
+               $top = array();
                while (count($arr_index) > 0) {
-                       $top .= join(" | \n",array_splice($arr_index,0,16))."<br />\n";
+                       $top[] = join(" | \n",array_splice($arr_index,0,16))."\n";
                }
-               $top .= "</div>\n";
-               $retval = $top.$retval;
+               $retval = "<div id=\"top\" style=\"text-align:center\">\n".
+                       join("<br />",$top)."</div>\n".$retval;
        }
        return $retval;
 }

diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index d30035c..dbd7def 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.18 2003/01/31 01:49:35 panda Exp $
+// $Id: pukiwiki.ini.php,v 1.19 2003/02/03 10:25:11 panda Exp $
 //
 // PukiWiki setting file
 
@@ -107,9 +107,6 @@ $cantedit = array( $whatsnew, );
 // ¸¡º÷ʸ»úÎó¤ò¿§Ê¬¤±¤¹¤ë
 $search_word_color = 1;
 /////////////////////////////////////////////////
-// [[¥Ú¡¼¥¸]] ¤Ø¤Î¥ê¥ó¥¯»þ[[]]¤ò³°¤¹
-$strip_link_wall = 1;
-/////////////////////////////////////////////////
 // °ìÍ÷¥Ú¡¼¥¸¤ËƬʸ»ú¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¤Ä¤±¤ë
 $list_index = 1;