From: masui <masui>
Date: Tue, 16 Jul 2002 07:48:41 +0000 (+0900)
Subject: [[pukiwiki:注釈のバグ]] 注釈を一行に二つ以上入れた場合におかしくなる問題を修正
X-Git-Tag: r1_5_0_rc1~2043
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0fd4a294b4d643af9da88320c5d692840083dd26;p=pukiwiki%2Fpukiwiki.git

[[pukiwiki:注釈のバグ]] 注釈を一行に二つ以上入れた場合におかしくなる問題を修正
---

diff --git a/html.php b/html.php
index e1aa444..15961db 100644
--- a/html.php
+++ b/html.php
@@ -1,6 +1,6 @@
 <?
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.21 2002/07/15 07:43:57 masui Exp $
+// $Id: html.php,v 1.22 2002/07/16 07:48:41 masui Exp $
 /////////////////////////////////////////////////
 
 // ËÜʸ¤ò¥Ú¡¼¥¸Ì¾¤«¤é½ÐÎÏ
@@ -368,13 +368,7 @@ function inline($line)
 {
 	$line = htmlspecialchars($line);
 
-	$line = preg_replace("/(
-
-					(\(\(([^\(\)]+)\)\))
-					|
-					(\(\((.+)\)\))
-
-				)/ex","make_note(\"$1\")",$line);
+	$line = preg_replace("/\(\(((?:(?!\)\)).)*)\)\)/ex","make_note(\"$1\")",$line);
 
 	return $line;
 }