• R/O
  • HTTP
  • SSH
  • HTTPS

pukiwiki: Commit


Commit MetaInfo

Revision26564dde72fae6a939e74c2eff3f13e3dba37994 (tree)
Time2016-11-18 01:06:57
Authorumorigu <umorigu@gmai...>
Commiterumorigu

Log Message

BugTrack/2389 Remove DTD selecting function

Change Summary

Incremental Difference

--- a/plugin/color.inc.php
+++ b/plugin/color.inc.php
@@ -1,6 +1,9 @@
11 <?php
22 // PukiWiki - Yet another WikiWikiWeb clone.
3-// $Id: color.inc.php,v 1.25 2011/01/25 15:01:01 henoheno Exp $
3+// color.inc.php
4+// Copyright
5+// 2003-2016 PukiWiki Development Team
6+// License: GPL v2 or (at your option) any later version
47 //
58 // Text color plugin
69
@@ -14,8 +17,6 @@ define('PLUGIN_COLOR_REGEX', '/^(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z-]+)$/i');
1417
1518 function plugin_color_inline()
1619 {
17- global $pkwk_dtd;
18-
1920 $args = func_get_args();
2021 $text = strip_autolink(array_pop($args)); // Already htmlsc(text)
2122
@@ -34,7 +35,7 @@ function plugin_color_inline()
3435 return '&color():Invalid color: ' . htmlsc($col) . ';';
3536 }
3637
37- if (PLUGIN_COLOR_ALLOW_CSS === TRUE || ! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1) {
38+ if (PLUGIN_COLOR_ALLOW_CSS) {
3839 $delimiter = '';
3940 if ($color != '' && $bgcolor != '') $delimiter = '; ';
4041 if ($color != '') $color = 'color:' . $color;
@@ -46,4 +47,3 @@ function plugin_color_inline()
4647 return '<font color="' . $color . '">' . $text . '</font>';
4748 }
4849 }
49-?>
--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -1,7 +1,9 @@
11 <?php
22 // PukiWiki - Yet another WikiWikiWeb clone
3-//
4-// $Id: paint.inc.php,v 1.20 2011/01/25 15:01:01 henoheno Exp $
3+// paint.inc.php
4+// Copyright
5+// 2002-2016 PukiWiki Development Team
6+// License: GPL v2 or (at your option) any later version
57 //
68 // Paint plugin
79
@@ -38,7 +40,7 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
3840
3941 function plugin_paint_action()
4042 {
41- global $script, $vars, $pkwk_dtd, $_paint_messages;
43+ global $script, $vars, $_paint_messages;
4244
4345 if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
4446
@@ -143,9 +145,6 @@ function plugin_paint_action()
143145 </applet>
144146 </div>
145147 EOD;
146- // XHTML 1.0 Transitional
147- if (! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1)
148- $pkwk_dtd = PKWK_DTD_XHTML_1_0_TRANSITIONAL;
149148 }
150149 return $retval;
151150 }
@@ -266,4 +265,3 @@ function paint_insert_ref($filename)
266265
267266 return $ret;
268267 }
269-
Show on old repository browser