From 1698ec9d0ad3d4ba7a39420310410eb6503bc468 Mon Sep 17 00:00:00 2001
From: arino <arino>
Date: Mon, 30 Jun 2003 14:57:19 +0900
Subject: [PATCH] =?utf8?q?=E3=81=86=E3=81=BE=E3=81=8F=E5=8B=95=E3=81=8B?=
 =?utf8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81=E5=85=83=E3=81=AB?=
 =?utf8?q?=E6=88=BB=E3=81=97=E3=81=BE=E3=81=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

diff --git a/make_link.php b/make_link.php
index 1d9ebf6..3b86da5 100644
--- a/make_link.php
+++ b/make_link.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: make_link.php,v 1.46 2003/06/30 05:08:36 arino Exp $
+// $Id: make_link.php,v 1.47 2003/06/30 05:57:19 arino Exp $
 //
 
 // ¥ê¥ó¥¯¤òÉղ乤ë
@@ -206,13 +206,13 @@ class Link_plugin extends Link
  (\w+)      # (2) plugin name
  (?:
   \(
-   ((?:(?!\);).)*)  # (3) parameter
+   ([^)]*)  # (3) parameter
   \)
  )?
 )
 (?:
  \{
-  ((?:(?!};).)*) # (4) body
+  (.*) # (4) body
  \}
 )?
 ;
@@ -241,7 +241,7 @@ EOD;
 	{
 		//&hoge(){...}; &fuga(){...}; ¤Îbody¤¬'...}; &fuga(){...'¤È¤Ê¤ë¤Î¤Ç¡¢Á°¸å¤Ëʬ¤±¤ë
 		$after = '';
-		if (preg_match("/^ ((?!};).*?) }; (.*?)  &amp; ( (\w+) (?: \( ((?:(?!\);).)*) \) )? ) { (.+)$/x",$body,$matches))
+		if (preg_match("/^ ((?!};).*?) }; (.*?)  &amp; ( (\w+) (?: \( ([^()]*) \) )? ) { (.+)$/x",$body,$matches))
 		{
 			$body = $matches[1];
 			$after = $matches[2].$this->make_inline($matches[3],$matches[4],$matches[5],$matches[6]);
-- 
2.11.0