From: henoheno <henoheno>
Date: Sat, 19 Mar 2005 01:26:53 +0000 (+0900)
Subject: BugTrack/786, BugTrack/583: Merged '&br;' rule into br plugin. Br tags should not... 
X-Git-Tag: r1_5_0_rc1~463
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ae6d430753ce9fb40a68f1dc43bf457b10dd43e;p=pukiwiki%2Fpukiwiki.git

BugTrack/786, BugTrack/583: Merged '&br;' rule into br plugin. Br tags should not use between blockquote tag (worked by reimy)
---

diff --git a/default.ini.php b/default.ini.php
index 65c9096..2b41920 100644
--- a/default.ini.php
+++ b/default.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: default.ini.php,v 1.16 2004/12/24 15:30:29 henoheno Exp $
+// $Id: default.ini.php,v 1.17 2005/03/19 01:26:53 henoheno Exp $
 //
 // PukiWiki setting file (user agent:default)
 
@@ -100,7 +100,6 @@ $line_rules = array(
 	'%%(?!%)((?:(?!%%).)*)%%'	=> '<del>$1</del>',
 	"'''(?!')((?:(?!''').)*)'''"	=> '<em>$1</em>',
 	"''(?!')((?:(?!'').)*)''"	=> '<strong>$1</strong>',
-	'&amp;br;'	=> '<br />',
 );
 
 /////////////////////////////////////////////////
diff --git a/keitai.ini.php b/keitai.ini.php
index 5eeebb1..0943757 100644
--- a/keitai.ini.php
+++ b/keitai.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: keitai.ini.php,v 1.17 2004/10/31 02:01:38 henoheno Exp $
+// $Id: keitai.ini.php,v 1.18 2005/03/19 01:26:53 henoheno Exp $
 //
 // PukiWiki setting file (Cell phones, PDAs and other thin clients)
 
@@ -169,7 +169,6 @@ $line_rules = array(
 	'%%(?!%)((?:(?!%%).)*)%%'	=> '<del>$1</del>',
 	"'''(?!')((?:(?!''').)*)'''"	=> '<em>$1</em>',
 	"''(?!')((?:(?!'').)*)''"	=> '<strong>$1</strong>',
-	'&amp;br;'	=> '<br>',
 );
 
 
diff --git a/plugin/br.inc.php b/plugin/br.inc.php
index 15cb933..cd82244 100644
--- a/plugin/br.inc.php
+++ b/plugin/br.inc.php
@@ -1,11 +1,27 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: br.inc.php,v 1.3 2005/01/22 03:31:49 henoheno Exp $
+// $Id: br.inc.php,v 1.4 2005/03/19 01:26:53 henoheno Exp $
 //
 // Forcing a line break plugin
 
+// Escape using <br> in <blockquote> (BugTrack/583)
+define('PLUGIN_BR_ESCAPE_BLOCKQUOTE', 1);
+
+// ----
+
+define('PLUGIN_BR_TAG', '<br class="spacer" />');
+
 function plugin_br_convert()
 {
-	return '<br class="spacer" />';
+	if (PLUGIN_BR_ESCAPE_BLOCKQUOTE) {
+		return '<div class="spacer">&nbsp;</div>';
+	} else {
+		return PLUGIN_BR_TAG;
+	}
+}
+
+function plugin_br_inline()
+{
+	return PLUGIN_BR_TAG;
 }
 ?>