From: teanan <teanan>
Date: Fri, 7 Apr 2006 18:44:58 +0000 (+0900)
Subject: BugTrack2/2: Related functions support autolink.
X-Git-Tag: r1_4_7_autoalias~3
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=8160ab7adf911e52e64db82d9bf4914125b4b53f

BugTrack2/2: Related functions support autolink.
---

diff --git a/lib/link.php b/lib/link.php
index 1a51c15..bad6fd8 100644
--- a/lib/link.php
+++ b/lib/link.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: link.php,v 1.4.2.1 2005/12/11 18:03:45 teanan Exp $
+// $Id: link.php,v 1.4.2.2 2006/04/07 18:44:58 teanan Exp $
 // Copyright (C) 2003-2005 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -72,6 +72,11 @@ function links_update($page)
 
 		if (is_a($_obj, 'Link_autolink')) { // ¹Ôµ·¤¬°­¤¤
 			$rel_auto[] = $_obj->name;
+		} else if (is_a($_obj, 'Link_autoalias')) {
+			$_alias = $_obj->get_alias($_obj->name);
+			if (is_pagename($_alias)) {
+				$rel_auto[] = $_alias;
+			}
 		} else {
 			$rel_new[]  = $_obj->name;
 		}
@@ -155,11 +160,24 @@ function links_init()
 			    $_obj->name == $page || $_obj->name == '')
 				continue;
 
-			$rel[] = $_obj->name;
+			$_name = $_obj->name;
 			if (! is_a($_obj, 'Link_autolink')) {
-				$ref_notauto[$_obj->name][$page] = TRUE;
+				if (is_a($_obj, 'Link_autoalias')) {
+					$_alias = $_obj->get_alias($_obj->name);
+					if (is_pagename($_alias)) {
+						$ref_notauto[$_alias][$page] = TRUE;
+						$_name = $_alias;
+					} else {
+						$_name = '';	// not PageName
+					}
+				} else {
+					$ref_notauto[$_obj->name][$page] = TRUE;
+				}
+			}
+			if ($_name != '') {
+				$rel[] = $_name;
+				$ref[$_name][] = $page;
 			}
-			$ref[$_obj->name][] = $page;
 		}
 		$rel = array_unique($rel);
 		if (! empty($rel)) {