Commit: 26564dde72fae6a939e74c2eff3f13e3dba37994 - pukiwiki (git)

Commit MetaInfo

• Revision: 26564dde72fae6a939e74c2eff3f13e3dba37994 (tree)
• Time: 2016-11-18 01:06:57
• Author: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2389 Remove DTD selecting function

Change Summary

• modified: plugin/color.inc.php
• modified: plugin/paint.inc.php

Incremental Difference

--- a/plugin/color.inc.php
+++ b/plugin/color.inc.php
@@ -1,6 +1,9 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: color.inc.php,v 1.25 2011/01/25 15:01:01 henoheno Exp $
+// color.inc.php
+// Copyright
+//   2003-2016 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Text color plugin
 
@@ -14,8 +17,6 @@ define('PLUGIN_COLOR_REGEX', '/^(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z-]+)$/i');
 
 function plugin_color_inline()
 {
-	global $pkwk_dtd;
-
 	$args = func_get_args();
 	$text = strip_autolink(array_pop($args)); // Already htmlsc(text)
 
@@ -34,7 +35,7 @@ function plugin_color_inline()
 			return '&color():Invalid color: ' . htmlsc($col) . ';';
 	}
 
-	if (PLUGIN_COLOR_ALLOW_CSS === TRUE || ! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1) {
+	if (PLUGIN_COLOR_ALLOW_CSS) {
 		$delimiter = '';
 		if ($color != '' && $bgcolor != '') $delimiter = '; ';
 		if ($color   != '') $color   = 'color:' . $color;
@@ -46,4 +47,3 @@ function plugin_color_inline()
 		return '<font color="' . $color . '">' . $text . '</font>';
 	}
 }
-?>

--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -1,7 +1,9 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-//
-// $Id: paint.inc.php,v 1.20 2011/01/25 15:01:01 henoheno Exp $
+// paint.inc.php
+// Copyright
+//   2002-2016 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Paint plugin
 
@@ -38,7 +40,7 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
 
 function plugin_paint_action()
 {
-	global $script, $vars, $pkwk_dtd, $_paint_messages;
+	global $script, $vars, $_paint_messages;
 
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 	
@@ -143,9 +145,6 @@ function plugin_paint_action()
  </applet>
  </div>
 EOD;
-		// XHTML 1.0 Transitional
-		if (! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1)
-			$pkwk_dtd = PKWK_DTD_XHTML_1_0_TRANSITIONAL;
 	}
 	return $retval;
 }
@@ -266,4 +265,3 @@ function paint_insert_ref($filename)
 
 	return $ret;
 }
-