From 112874a6327811e57f7e52a59b8ed638653b3b78 Mon Sep 17 00:00:00 2001
From: panda <panda>
Date: Fri, 7 Mar 2003 16:04:07 +0900
Subject: [PATCH] get forceignorepages list from cache/autolink.dat

---
 make_link.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/make_link.php b/make_link.php
index 0275f2d..bbd22cc 100644
--- a/make_link.php
+++ b/make_link.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: make_link.php,v 1.22 2003/03/06 05:42:21 panda Exp $
+// $Id: make_link.php,v 1.23 2003/03/07 07:04:07 panda Exp $
 //
 
 // ¥ê¥ó¥¯¤òÉղ乤ë
@@ -149,25 +149,27 @@ class Link
 // ¥ª¡¼¥È¥ê¥ó¥¯,WikiName
 class Link_auto extends Link
 {
-	var $ignorepages;
+	var $forceignorepages;
 	
 	function Link_auto($start)
 	{
-		global $forceignorelistpage;
-		
 		parent::Link($start);
-		$this->ignorepages = get_autolink_ignorepages($forceignorelistpage);
 	}
 	function get_pattern()
 	{
 		global $WikiName,$autolink,$nowikiname;
+		static $auto,$forceignorepages;
 		
 		if (!$autolink or !file_exists(CACHE_DIR.'autolink.dat'))
 		{
 			return $nowikiname ? '(?!)' : $WikiName;
 		}
-		
-		list($auto) = file(CACHE_DIR.'autolink.dat');
+		if (!isset($auto)) // and/or !isset($forceignorepages)
+		{
+			list($auto,$forceignorepages) = file(CACHE_DIR.'autolink.dat');
+			$forceignorepages = explode("\t",$forceignorepages);
+		}
+		$this->forceignorepages = $forceignorepages;
 		return "($auto)";
 	}
 	function get_count()
@@ -179,7 +181,7 @@ class Link_auto extends Link
 		$arr = $this->splice($arr);
 		$name = $alias = $arr[0];
 		// ¥ß¥¹¥Þ¥Ã¥Á¡¢¤Þ¤¿¤Ï̵»ë¥ê¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¥Ú¡¼¥¸¤ò¼Î¤Æ¤ë
-		if (!is_page($name) or in_array($name,$this->ignorepages))
+		if (!is_page($name) or in_array($name,$this->forceignorepages))
 		{
 			return FALSE;
 		}
-- 
2.11.0