コミット: 74335459853fd76cdbc9a765e8c8ee93f5cc3c78 - teswiki (git)

blogger

コミットメタ情報

• リビジョン: 74335459853fd76cdbc9a765e8c8ee93f5cc3c78 (tree)
• 日時: 2016-11-06 17:56:43
• 作者: umorigu <umorigu@gmai...>
• コミッター: umorigu

ログメッセージ

BugTrack/2394 Add PHP4 Compatibility on constructor

PHP7 doesn't show E_DEPRECATED warning on existance of
both constructor() and old style ClassName() constructor.

変更サマリ

• modified: lib/config.php
• modified: lib/convert_html.php
• modified: lib/diff.php
• modified: lib/make_link.php
• modified: plugin/attach.inc.php
• modified: plugin/dump.inc.php
• modified: plugin/map.inc.php
• modified: plugin/showrss.inc.php
• modified: plugin/tracker.inc.php

差分

--- a/lib/config.php
+++ b/lib/config.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: config.php,v 1.6 2005/04/29 11:24:20 henoheno Exp $
-// Copyright (C) 2003-2005 PukiWiki Developers Team
+// config.php
+// Copyright 2003-2016 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Parse a PukiWiki page as a configuration page
@@ -27,6 +27,10 @@ class Config
 	var $name, $page; // Page name
 	var $objs = array();
 
+	function Config($name)
+	{
+		$this->__construct($name);
+	}
 	function __construct($name)
 	{
 		$this->name = $name;
@@ -135,6 +139,10 @@ class ConfigTable
 	var $after  = array();	// Page contents (except table ones)
 	var $values = array();	// Table contents
 
+	function ConfigTable($title, $obj = NULL)
+	{
+		$this->__construct($title, $obj);
+	}
 	function __construct($title, $obj = NULL)
 	{
 		if ($obj !== NULL) {
@@ -221,4 +229,3 @@ class ConfigTable_Direct extends ConfigTable
 		return $retval;
 	}
 }
-

--- a/lib/convert_html.php
+++ b/lib/convert_html.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: convert_html.php,v 1.21 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// convert_html.php
+// Copyright
+//   2002-2016 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -32,6 +32,10 @@ class Element
 	var $elements; // References of childs
 	var $last;     // Insert new one at the back of the $last
 
+	function Element()
+	{
+		$this->__construct();
+	}
 	function __construct()
 	{
 		$this->elements = array();
@@ -165,6 +169,10 @@ function & Factory_Div(& $root, $text)
 // Inline elements
 class Inline extends Element
 {
+	function Inline($text)
+	{
+		$this->__construct($text);
+	}
 	function __construct($text)
 	{
 		parent::__construct();
@@ -202,6 +210,10 @@ class Paragraph extends Element
 {
 	var $param;
 
+	function Paragraph($text, $param = '')
+	{
+		$this->__construct($text, $param);
+	}
 	function __construct($text, $param = '')
 	{
 		parent::__construct();
@@ -234,6 +246,10 @@ class Heading extends Element
 	var $id;
 	var $msg_top;
 
+	function Heading(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		parent::__construct();
@@ -266,6 +282,10 @@ class Heading extends Element
 // Horizontal Rule
 class HRule extends Element
 {
+	function HRule(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		parent::__construct();
@@ -293,6 +313,10 @@ class ListContainer extends Element
 	var $margin;
 	var $left_margin;
 
+	function ListContainer($tag, $tag2, $head, $text)
+	{
+		$this->__construct($tag, $tag2, $head, $text);
+	}
 	function __construct($tag, $tag2, $head, $text)
 	{
 		parent::__construct();
@@ -361,6 +385,10 @@ class ListContainer extends Element
 
 class ListElement extends Element
 {
+	function ListElement($level, $head)
+	{
+		$this->__construct($level, $head);
+	}
 	function __construct($level, $head)
 	{
 		parent::__construct();
@@ -384,6 +412,10 @@ class ListElement extends Element
 // - Three
 class UList extends ListContainer
 {
+	function UList(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		parent::__construct('ul', 'li', '-', $text);
@@ -395,6 +427,10 @@ class UList extends ListContainer
 // + Three
 class OList extends ListContainer
 {
+	function OList(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		parent::__construct('ol', 'li', '+', $text);
@@ -406,6 +442,10 @@ class OList extends ListContainer
 // : definition3 | description3
 class DList extends ListContainer
 {
+	function DList($out)
+	{
+		$this->__construct($out);
+	}
 	function __construct($out)
 	{
 		parent::__construct('dl', 'dt', ':', $out[0]);
@@ -421,6 +461,10 @@ class BQuote extends Element
 {
 	var $level;
 
+	function BQuote(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		parent::__construct();
@@ -484,6 +528,10 @@ class TableCell extends Element
 	var $rowspan = 1;
 	var $style; // is array('width'=>, 'align'=>...);
 
+	function TableCell($text, $is_template = FALSE)
+	{
+		$this->__construct($text, $is_template);
+	}
 	function __construct($text, $is_template = FALSE)
 	{
 		parent::__construct();
@@ -561,6 +609,10 @@ class Table extends Element
 	var $types;
 	var $col; // number of column
 
+	function Table($out)
+	{
+		$this->__construct($out);
+	}
 	function __construct($out)
 	{
 		parent::__construct();
@@ -662,6 +714,10 @@ class YTable extends Element
 {
 	var $col;	// Number of columns
 
+	function YTable($row = array('cell1 ', ' cell2 ', ' cell3'))
+	{
+		$this->__construct($row);
+	}
 	// TODO: Seems unable to show literal '==' without tricks.
 	//       But it will be imcompatible.
 	// TODO: Why toString() or toXHTML() here
@@ -738,6 +794,10 @@ class YTable extends Element
 // ' 'Space-beginning sentence
 class Pre extends Element
 {
+	function Pre(& $root, $text)
+	{
+		$this->__construct($root, $text);
+	}
 	function __construct(& $root, $text)
 	{
 		global $preformat_ltrim;
@@ -769,6 +829,10 @@ class Div extends Element
 	var $name;
 	var $param;
 
+	function Div($out)
+	{
+		$this->__construct($out);
+	}
 	function __construct($out)
 	{
 		parent::__construct();
@@ -792,6 +856,10 @@ class Align extends Element
 {
 	var $align;
 
+	function Align($align)
+	{
+		$this->__construct($align);
+	}
 	function __construct($align)
 	{
 		parent::__construct();
@@ -827,6 +895,10 @@ class Body extends Element
 		',' => 'YTable',
 		'#' => 'Div');
 
+	function Body($id)
+	{
+		$this->__construct($id);
+	}
 	function __construct($id)
 	{
 		$this->id            = $id;
@@ -979,6 +1051,10 @@ class Body extends Element
 
 class Contents_UList extends ListContainer
 {
+	function Contents_UList($text, $level, $id)
+	{
+		$this->__construct($text, $level, $id);
+	}
 	function __construct($text, $level, $id)
 	{
 		// Reformatting $text

--- a/lib/diff.php
+++ b/lib/diff.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: diff.php,v 1.10 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2003-2005, 2007 PukiWiki Developers Team
+// diff.php
+// Copyright
+//   2003-2016 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -99,6 +99,10 @@ class line_diff
 {
 	var $arr1, $arr2, $m, $n, $pos, $key, $plus, $minus, $equal, $reverse;
 
+	function line_diff($plus = '+', $minus = '-', $equal = ' ')
+	{
+		$this->__construct($plus, $minus, $equal);
+	}
 	function __construct($plus = '+', $minus = '-', $equal = ' ')
 	{
 		$this->plus  = $plus;
@@ -254,6 +258,10 @@ class DiffLine
 	var $text;
 	var $status;
 
+	function DiffLine($text)
+	{
+		$this->__construct($text);
+	}
 	function __construct($text)
 	{
 		$this->text   = $text . "\n";
@@ -285,4 +293,3 @@ class DiffLine
 		return $this->text;
 	}
 }
-?>

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -50,6 +50,10 @@ class InlineConverter
 		$this->converters = $converters;
 	}
 
+	function InlineConverter($converters = NULL, $excludes = NULL)
+	{
+		$this->__construct($converters, $excludes);
+	}
 	function __construct($converters = NULL, $excludes = NULL)
 	{
 		if ($converters === NULL) {
@@ -150,7 +154,10 @@ class Link
 	var $body;
 	var $alias;
 
-	// Constructor
+	function Link($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		$this->start = $start;
@@ -209,6 +216,10 @@ class Link_plugin extends Link
 	var $pattern;
 	var $plain,$param;
 
+	function Link_plugin($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -278,6 +289,10 @@ EOD;
 // Footnotes
 class Link_note extends Link
 {
+	function Link_note($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -346,6 +361,10 @@ EOD;
 // URLs
 class Link_url extends Link
 {
+	function Link_url($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -393,6 +412,10 @@ EOD;
 // URLs (InterWiki definition on "InterWikiName")
 class Link_url_interwiki extends Link
 {
+	function Link_url_interwiki($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -433,6 +456,10 @@ class Link_mailto extends Link
 {
 	var $is_image, $image;
 
+	function Link_mailto($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -475,6 +502,10 @@ class Link_interwikiname extends Link
 	var $param  = '';
 	var $anchor = '';
 
+	function Link_interwikiname($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -544,6 +575,10 @@ class Link_bracketname extends Link
 {
 	var $anchor, $refer;
 
+	function Link_bracketname($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -606,6 +641,10 @@ EOD;
 // WikiNames
 class Link_wikiname extends Link
 {
+	function Link_wikiname($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);
@@ -647,6 +686,10 @@ class Link_autolink extends Link
 	var $auto;
 	var $auto_a; // alphabet only
 
+	function Link_autolink($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		global $autolink;
@@ -693,6 +736,10 @@ class Link_autolink extends Link
 
 class Link_autolink_a extends Link_autolink
 {
+	function Link_autolink_a($start)
+	{
+		$this->__construct($start);
+	}
 	function __construct($start)
 	{
 		parent::__construct($start);

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -432,6 +432,10 @@ class AttachFile
 	var $size_str = '';
 	var $status = array('count'=>array(0), 'age'=>'', 'pass'=>'', 'freeze'=>FALSE);
 
+	function AttachFile($page, $file, $age = 0)
+	{
+		$this->__construct($page, $file, $age);
+	}
 	function __construct($page, $file, $age = 0)
 	{
 		$this->page = $page;
@@ -754,6 +758,10 @@ class AttachFiles
 	var $page;
 	var $files = array();
 
+	function AttachFiles($page)
+	{
+		$this->__construct($page);
+	}
 	function __construct($page)
 	{
 		$this->page = $page;
@@ -823,6 +831,10 @@ class AttachPages
 {
 	var $pages = array();
 
+	function AttachPages($page = '', $age = NULL)
+	{
+		$this->__construct($page, $age);
+	}
 	function __construct($page = '', $age = NULL)
 	{
 

--- a/plugin/dump.inc.php
+++ b/plugin/dump.inc.php
@@ -1,7 +1,8 @@
 <?php
-// $Id: dump.inc.php,v 1.41 2007/11/03 15:17:52 henoheno Exp $
-// Copyright (C)
-//   2004-2007 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone
+// dump.inc.php
+// Copyright
+//   2004-2016 PukiWiki Development Team
 //   2004      teanan / Interfair Laboratory
 // License: GPL v2 or (at your option) any later version
 //
@@ -330,7 +331,9 @@ class tarlib
 	var $arc_kind;
 	var $dummydata;
 
-	// コンストラクタ
+	function tarlib() {
+		$this->__construct();
+	}
 	function __construct() {
 		$this->filename = '';
 		$this->fp       = FALSE;
@@ -713,4 +716,3 @@ class tarlib
 		$this->status = TARLIB_STATUS_INIT;
 	}
 }
-?>

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: map.inc.php,v 1.18 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2002-2005, 2007 PukiWiki Developers Team
+// map.inc.php
+// Copyright 2002-2016 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Site map plugin
@@ -104,6 +104,10 @@ class MapNode
 	var $done;
 	var $hide_pattern;
 
+	function MapNode($page, $reverse = FALSE)
+	{
+		$this->__construct($page, $reverse);
+	}
 	function __construct($page, $reverse = FALSE)
 	{
 		global $script, $non_list;
@@ -203,4 +207,3 @@ class MapNode
 		return $retval;
 	}
 }
-

--- a/plugin/showrss.inc.php
+++ b/plugin/showrss.inc.php
@@ -77,6 +77,10 @@ class ShowRSS_html
 	var $items = array();
 	var $class = '';
 
+	function ShowRSS_html($rss)
+	{
+		$this->__construct($rss);
+	}
 	function __construct($rss)
 	{
 		foreach ($rss as $date=>$items) {

--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: tracker.inc.php,v 1.124 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2003-2005, 2007 PukiWiki Developers Team
+// tracker.inc.php
+// Copyright 2003-2016 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Issue tracker plugin (See Also bugtrack plugin)
@@ -267,6 +267,10 @@ class Tracker_field
 	var $sort_type = SORT_REGULAR;
 	var $id = 0;
 
+	function Tracker_field($field,$page,$refer,&$config)
+	{
+		$this->__construct($field, $page, $refer, $config);
+	}
 	function __construct($field,$page,$refer,&$config)
 	{
 		global $post;
@@ -373,6 +377,10 @@ class Tracker_field_format extends Tracker_field
 	var $styles = array();
 	var $formats = array();
 
+	function Tracker_field_format($field,$page,$refer,&$config)
+	{
+		$this->__construct($field, $page, $refer, $config);
+	}
 	function __construct($field,$page,$refer,&$config)
 	{
 		parent::__construct($field,$page,$refer,$config);
@@ -663,6 +671,10 @@ class Tracker_list
 	var $order;
 	var $sort_keys;
 
+	function Tracker_list($page,$refer,&$config,$list)
+	{
+		$this->__construct($page, $refer, $config, $list);
+	}
 	function __construct($page,$refer,&$config,$list)
 	{
 		$this->page = $page;
@@ -936,4 +948,3 @@ function plugin_tracker_get_source($page)
 	// #freezeを削除
 	return preg_replace('/^#freeze\s*$/im', '', $source);
 }
-