Commit: 6c646361de92d93e8d5135a7d1ff3ab057c88e93 - pukiwiki (git)

Commit MetaInfo

• Revision: 6c646361de92d93e8d5135a7d1ff3ab057c88e93 (tree)
• Time: 2014-11-26 01:57:56
• Author: henoheno <henoheno>
• Commiter: umorigu

Log Message

BugTrack2/225: <br> => <br /> (patched by g@kko)

Change Summary

• modified: plugin/br.inc.php
• modified: plugin/img.inc.php
• modified: plugin/includesubmenu.inc.php

Incremental Difference

--- a/plugin/br.inc.php
+++ b/plugin/br.inc.php
@@ -1,10 +1,12 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: br.inc.php,v 1.4 2005/03/19 01:26:53 henoheno Exp $
+// $Id: br.inc.php,v 1.5 2007/04/08 10:22:18 henoheno Exp $
+// Copyright (C) 2003-2005, 2007 PukiWiki Developers Team
+// License: GPL v2 or (at your option) any later version
 //
-// Forcing a line break plugin
+// "Forcing one line-break" plugin
 
-// Escape using <br> in <blockquote> (BugTrack/583)
+// Escape using <br /> in <blockquote> (BugTrack/583)
 define('PLUGIN_BR_ESCAPE_BLOCKQUOTE', 1);
 
 // ----

--- a/plugin/img.inc.php
+++ b/plugin/img.inc.php
@@ -1,18 +1,19 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: img.inc.php,v 1.14 2005/05/28 13:31:57 henoheno Exp $
+// $Id: img.inc.php,v 1.15 2007/04/08 10:22:18 henoheno Exp $
+// Copyright (C) 2002-2005, 2007 PukiWiki Developers Team
+// License: GPL v2 or (at your option) any later version
 //
-// Inline-image plugin
+// Inline-image plugin (Output inline-image tag from a URI)
 
 define('PLUGIN_IMG_USAGE', '#img(): Usage: (URI-to-image[,right[,clear]])<br />' . "\n");
 define('PLUGIN_IMG_CLEAR', '<div style="clear:both"></div>' . "\n"); // Stop word-wrapping
 
-// Output inline-image tag from a URI
 function plugin_img_convert()
 {
 	if (PKWK_DISABLE_INLINE_IMAGE_FROM_URI)
 		return '#img(): PKWK_DISABLE_INLINE_IMAGE_FROM_URI prohibits this' .
-			'<br>' . "\n";
+			'<br />' . "\n";
 
 	$args = func_get_args();
 

--- a/plugin/includesubmenu.inc.php
+++ b/plugin/includesubmenu.inc.php
@@ -31,8 +31,8 @@ function plugin_includesubmenu_convert()
   } else {
     $SubMenuPageName2 = substr($tmppage,0,$LastSlash) . '/SubMenu';
   }
-  //echo "$SubMenuPageName1 <br>";
-  //echo "$SubMenuPageName2 <br>";
+  //echo "$SubMenuPageName1 <br />";
+  //echo "$SubMenuPageName2 <br />";
   //下階層にSubMenuがあるかチェック
   //あれば、それを使用
   if (is_page($SubMenuPageName1)) {