r44839 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r44838‎ \| r44839 \| r44840 >
Date:	09:32, 20 December 2008
Author:	aaron
Status:	deferred
Tags:
Comment:	Search & replace war on old wf* xml functions
Modified paths:	/trunk/extensions/AbuseFilter/SpecialAbuseLog.php (modified) (history) /trunk/extensions/ActiveAbstract/AbstractFilter.php (modified) (history) /trunk/extensions/ActiveAbstract/GoogleCoopFilter.php (modified) (history) /trunk/extensions/Aggregator/Aggregator.php (modified) (history) /trunk/extensions/AjaxTest/AjaxTestPage.php (modified) (history) /trunk/extensions/AuthorProtect/AuthorProtect.php (modified) (history) /trunk/extensions/BotQuery/query.php (modified) (history) /trunk/extensions/CentralAuth/SpecialCentralAuth.php (modified) (history) /trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php (modified) (history) /trunk/extensions/CentralAuth/SpecialMergeAccount.php (modified) (history) /trunk/extensions/Cite/SpecialCite_body.php (modified) (history) /trunk/extensions/ConfirmAccount/ConfirmAccount_body.php (modified) (history) /trunk/extensions/ConfirmAccount/RequestAccount_body.php (modified) (history) /trunk/extensions/ConfirmEdit/ConfirmEdit_body.php (modified) (history) /trunk/extensions/ConfirmEdit/FancyCaptcha.class.php (modified) (history) /trunk/extensions/ConfirmEdit/MathCaptcha.class.php (modified) (history) /trunk/extensions/Crosswiki/Block/CrosswikiBlock.page.php (modified) (history) /trunk/extensions/EditUser/1.13/EditUser_body.php (modified) (history) /trunk/extensions/EditUser/1.14/EditUser_body.php (modified) (history) /trunk/extensions/EmailPage/EmailPage_body.php (modified) (history) /trunk/extensions/Eval/SpecialEval.php (modified) (history) /trunk/extensions/FindSpam/FindSpam_body.php (modified) (history) /trunk/extensions/FixedImage/FixedImage.php (modified) (history) /trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php (modified) (history) /trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php (modified) (history) /trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php (modified) (history) /trunk/extensions/LiquidThreads/LqtBaseView.php (modified) (history) /trunk/extensions/LiquidThreads/LqtPages.php (modified) (history) /trunk/extensions/Makebot/Makebot.class.php (modified) (history) /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php (modified) (history) /trunk/extensions/MetavidWiki/skins/mv_embed/cortado_iframe.php (modified) (history) /trunk/extensions/MiniPreview/MiniPreview.php (modified) (history) /trunk/extensions/NewestPages/NewestPages.page.php (modified) (history) /trunk/extensions/OAI/OAIRepo_body.php (modified) (history) /trunk/extensions/Player/SpecialPlayer.php (modified) (history) /trunk/extensions/Poem/Poem.php (modified) (history) /trunk/extensions/PurgeCache/PurgeCache_body.php (modified) (history) /trunk/extensions/RecordAdmin/RecordAdmin_body.php (modified) (history) /trunk/extensions/SignDocument/SpecialCreateSignDocument.php (modified) (history) /trunk/extensions/SignDocument/SpecialSignDocument.php (modified) (history) /trunk/extensions/SisterSites/SisterSites.php (modified) (history) /trunk/extensions/SpecialForm/SpecialForm.body.php (modified) (history) /trunk/extensions/TalkHere/TalkHereArticle.php (modified) (history) /trunk/extensions/Tasks/Tasks.php (modified) (history) /trunk/extensions/Todo/SpecialTodo.php (modified) (history)

Diff [purge]

Index: trunk/extensions/AjaxTest/AjaxTestPage.php
—	—	@@ -47,36 +47,36 @@
48	48	function makeInputForm() {
49	49	$thisTitle = Title::makeTitle( NS_SPECIAL, $this->getName() );
50	50	$form = '';
51		~~- $form .= wfOpenElement( 'form', array( 'name' => 'ajaxtest', 'method' => 'get', 'action' => $thisTitle->getLocalUrl() ) );~~
52		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'ajaxtest_text', 'id' => 'ajaxtest_text', 'value' => '', 'size' => '64' ) ) . ' ';~~
53		~~- $form .= wfElement( 'br' );~~
54		~~- $form .= wfElement( 'label', array( 'for' => 'usestring' ), 'use string value' );~~
55		~~- $form .= wfElement( 'input', array( 'type' => 'checkbox', 'name' => 'usestring', 'id' => 'usestring') );~~
56		~~- $form .= wfElement( 'br' );~~
57		~~- $form .= wfElement( 'label', array( 'for' => 'httpcache' ), 'use http cache' );~~
58		~~- $form .= wfElement( 'input', array( 'type' => 'checkbox', 'name' => 'httpcache', 'id' => 'httpcache') );~~
59		~~- $form .= wfElement( 'br' );~~
60		~~- $form .= wfElement( 'label', array( 'for' => 'lastmod' ), 'use last modified' );~~
61		~~- $form .= wfElement( 'input', array( 'type' => 'checkbox', 'name' => 'lastmod', 'id' => 'lastmod') );~~
62		~~- $form .= wfElement( 'br' );~~
63		~~- $form .= wfElement( 'label', array( 'for' => 'error' ), 'trigger error' );~~
64		~~- $form .= wfElement( 'input', array( 'type' => 'checkbox', 'name' => 'error', 'id' => 'error') );~~
65		~~- $form .= wfElement( 'br' );~~
66		~~- $form .= wfOpenElement( 'select', array( 'name' => 'ajaxtest_target', 'id' => 'ajaxtest_target' ) );~~
67		~~- $form .= wfElement( 'option', array( 'value' => 'function' ), "function" );~~
68		~~- $form .= wfElement( 'option', array( 'value' => 'element' ), "element" );~~
69		~~- $form .= wfElement( 'option', array( 'value' => 'input' ), "input" );~~
70		~~- $form .= wfCloseElement( 'select' );~~
71		~~- $form .= wfElement( 'input', array( 'type' => 'button', 'onclick' => 'doAjaxTest();', 'value' => 'TEST' ) );~~
72		~~- $form .= wfElement( 'input', array( 'type' => 'button', 'onclick' => 'clearAjaxTest();', 'value' => 'CLEAR' ) );~~
73		~~- #$form .= wfElement( 'input', array( 'type' => 'button', 'onclick' => 'getElementById("ajaxtest_out").value= getElementById("ajaxtest_text").value;', 'value' => 'DUMMY' ) );~~
74		~~- $form .= wfCloseElement( 'form' );~~
	51	+ $form .= Xml::openElement( 'form', array( 'name' => 'ajaxtest', 'method' => 'get', 'action' => $thisTitle->getLocalUrl() ) );
	52	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'ajaxtest_text', 'id' => 'ajaxtest_text', 'value' => '', 'size' => '64' ) ) . ' ';
	53	+ $form .= Xml::element( 'br' );
	54	+ $form .= Xml::element( 'label', array( 'for' => 'usestring' ), 'use string value' );
	55	+ $form .= Xml::element( 'input', array( 'type' => 'checkbox', 'name' => 'usestring', 'id' => 'usestring') );
	56	+ $form .= Xml::element( 'br' );
	57	+ $form .= Xml::element( 'label', array( 'for' => 'httpcache' ), 'use http cache' );
	58	+ $form .= Xml::element( 'input', array( 'type' => 'checkbox', 'name' => 'httpcache', 'id' => 'httpcache') );
	59	+ $form .= Xml::element( 'br' );
	60	+ $form .= Xml::element( 'label', array( 'for' => 'lastmod' ), 'use last modified' );
	61	+ $form .= Xml::element( 'input', array( 'type' => 'checkbox', 'name' => 'lastmod', 'id' => 'lastmod') );
	62	+ $form .= Xml::element( 'br' );
	63	+ $form .= Xml::element( 'label', array( 'for' => 'error' ), 'trigger error' );
	64	+ $form .= Xml::element( 'input', array( 'type' => 'checkbox', 'name' => 'error', 'id' => 'error') );
	65	+ $form .= Xml::element( 'br' );
	66	+ $form .= Xml::openElement( 'select', array( 'name' => 'ajaxtest_target', 'id' => 'ajaxtest_target' ) );
	67	+ $form .= Xml::element( 'option', array( 'value' => 'function' ), "function" );
	68	+ $form .= Xml::element( 'option', array( 'value' => 'element' ), "element" );
	69	+ $form .= Xml::element( 'option', array( 'value' => 'input' ), "input" );
	70	+ $form .= Xml::closeElement( 'select' );
	71	+ $form .= Xml::element( 'input', array( 'type' => 'button', 'onclick' => 'doAjaxTest();', 'value' => 'TEST' ) );
	72	+ $form .= Xml::element( 'input', array( 'type' => 'button', 'onclick' => 'clearAjaxTest();', 'value' => 'CLEAR' ) );
	73	+ #$form .= Xml::element( 'input', array( 'type' => 'button', 'onclick' => 'getElementById("ajaxtest_out").value= getElementById("ajaxtest_text").value;', 'value' => 'DUMMY' ) );
	74	+ $form .= Xml::closeElement( 'form' );
75	75
76		~~- $form .= wfElement( 'hr' );~~
77		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'ajaxtest_out', 'id' => 'ajaxtest_out', 'value' => '', 'size' => '64' ) ) . ' ';~~
78		~~- $form .= wfElement( 'p', array( 'id' => 'ajaxtest_area' ) );~~
79		~~- $form .= wfElement( 'hr' );~~
80		~~- $form .= wfElement( 'p', array( 'id' => 'sajax_debug' ) );~~
	76	+ $form .= Xml::element( 'hr' );
	77	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'ajaxtest_out', 'id' => 'ajaxtest_out', 'value' => '', 'size' => '64' ) ) . ' ';
	78	+ $form .= Xml::element( 'p', array( 'id' => 'ajaxtest_area' ) );
	79	+ $form .= Xml::element( 'hr' );
	80	+ $form .= Xml::element( 'p', array( 'id' => 'sajax_debug' ) );
81	81	return $form;
82	82	}
83	83	}
Index: trunk/extensions/ActiveAbstract/GoogleCoopFilter.php
—	—	@@ -66,11 +66,11 @@
67	67	$this->title = Title::makeTitle( $page->page_namespace, $page->page_title );
68	68
69	69	$xml = " <ResultSpec id=\"mw${n}\">\n";
70		~~- $xml .= ' ' . wfElement( 'Query', null, $this->title->getPrefixedText() ) . "\n";~~
	70	+ $xml .= ' ' . Xml::element( 'Query', null, $this->title->getPrefixedText() ) . "\n";
71	71	$xml .= " <Response>\n";
72		~~- $xml .= ' ' . wfElement( 'Output', array( 'name' => 'title' ),~~
	72	+ $xml .= ' ' . Xml::element( 'Output', array( 'name' => 'title' ),
73	73	$wgSitename . ':' . $this->title->getPrefixedText() ) . "\n";
74		~~- $xml .= ' ' . wfElement( 'Output', array( 'name' => 'more_url' ),~~
	74	+ $xml .= ' ' . Xml::element( 'Output', array( 'name' => 'more_url' ),
75	75	$this->title->getFullUrl() ) . "\n";
76	76
77	77	// add abstract and links when we have revision data...
—	—	@@ -89,7 +89,7 @@
90	90	$lines = $this->_threeLines( $text );
91	91	for( $i=1; $i<4; $i++ ) {
92	92	if ( $lines[$i] != '' ) {
93		~~- $xml .= ' ' . wfElement( 'Output', array( 'name' => 'text'.$i ), $lines[$i] ) . "\n";~~
	93	+ $xml .= ' ' . Xml::element( 'Output', array( 'name' => 'text'.$i ), $lines[$i] ) . "\n";
94	94	}
95	95	}
96	96	}
Index: trunk/extensions/ActiveAbstract/AbstractFilter.php
—	—	@@ -55,8 +55,8 @@
56	56	$title = $wgSitename . ': ' . $this->title->getPrefixedText();
57	57
58	58	$xml = "<doc>\n";
59		~~- $xml .= wfElement( 'title', null, $this->_variant( $title ) ) . "\n";~~
60		~~- $xml .= wfElement( 'url', null, $this->title->getFullUrl() ) . "\n";~~
	59	+ $xml .= Xml::element( 'title', null, $this->_variant( $title ) ) . "\n";
	60	+ $xml .= Xml::element( 'url', null, $this->title->getFullUrl() ) . "\n";
61	61
62	62	// add abstract and links when we have revision data...
63	63	$this->revision = null;
—	—	@@ -67,7 +67,7 @@
68	68	function writeClosePage( $string ) {
69	69	$xml = '';
70	70	if( $this->revision ) {
71		~~- $xml .= wfElement( 'abstract', null,~~
	71	+ $xml .= Xml::element( 'abstract', null,
72	72	$this->_variant(
73	73	$this->_abstract( $this->revision ) ) ) . "\n";
74	74	$xml .= "<links>\n";
—	—	@@ -260,10 +260,10 @@
261	261	*/
262	262	function _formatLink( $url, $anchor, $type ) {
263	263	$maxUrlLength = 1024; // as defined in Yahoo's .xsd
264		~~- return wfOpenElement( 'sublink', array( 'linktype' => $type ) ) .~~
265		~~- wfElement( 'anchor', null, $this->_variant( $anchor ) ) .~~
266		~~- wfElement( 'link', null, substr( $url, 0, $maxUrlLength ) ) .~~
267		~~- wfCloseElement( 'sublink' ) . "\n";~~
	264	+ return Xml::openElement( 'sublink', array( 'linktype' => $type ) ) .
	265	+ Xml::element( 'anchor', null, $this->_variant( $anchor ) ) .
	266	+ Xml::element( 'link', null, substr( $url, 0, $maxUrlLength ) ) .
	267	+ Xml::closeElement( 'sublink' ) . "\n";
268	268	}
269	269
270	270	}
Index: trunk/extensions/EditUser/1.13/EditUser_body.php
—	—	@@ -789,7 +789,7 @@
790	790	} else {
791	791	# Need to output a hidden option even if the relevant skin is not in use,
792	792	# otherwise the preference will get reset to 0 on submit
793		~~- $wgOut->addHtml( wfHidden( 'wpQuickbar', $this->mQuickbar ) );~~
	793	+ $wgOut->addHtml( Xml::hidden( 'wpQuickbar', $this->mQuickbar ) );
794	794	}
795	795
796	796	# Skin
—	—	@@ -1107,12 +1107,12 @@
1108	1108
1109	1109	function makeSearchForm() {
1110	1110	$thisTitle = Title::makeTitle( NS_SPECIAL, $this->getName() );
1111		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );~~
1112		~~- $form .= wfElement( 'label', array( 'for' => 'username' ), wfMsg( 'edituser-username' ) ) . ' ';~~
1113		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';~~
1114		~~- $form .= wfElement( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'edituser-dosearch' ) ) );~~
1115		~~- $form .= wfElement( 'input', array( 'type' => 'hidden', 'name' => 'issearch', 'value' => '1' ) );~~
1116		~~- $form .= wfCloseElement( 'form' );~~
	1111	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
	1112	+ $form .= Xml::element( 'label', array( 'for' => 'username' ), wfMsg( 'edituser-username' ) ) . ' ';
	1113	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';
	1114	+ $form .= Xml::element( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'edituser-dosearch' ) ) );
	1115	+ $form .= Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'issearch', 'value' => '1' ) );
	1116	+ $form .= Xml::closeElement( 'form' );
1117	1117	return $form;
1118	1118	}
1119	1119	}
Index: trunk/extensions/EditUser/1.14/EditUser_body.php
—	—	@@ -812,7 +812,7 @@
813	813	} else {
814	814	# Need to output a hidden option even if the relevant skin is not in use,
815	815	# otherwise the preference will get reset to 0 on submit
816		~~- $wgOut->addHTML( wfHidden( 'wpQuickbar', $this->mQuickbar ) );~~
	816	+ $wgOut->addHTML( Xml::hidden( 'wpQuickbar', $this->mQuickbar ) );
817	817	}
818	818
819	819	# Skin
—	—	@@ -1128,12 +1128,12 @@
1129	1129
1130	1130	function makeSearchForm() {
1131	1131	$thisTitle = Title::makeTitle( NS_SPECIAL, $this->getName() );
1132		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );~~
1133		~~- $form .= wfElement( 'label', array( 'for' => 'username' ), wfMsg( 'edituser-username' ) ) . ' ';~~
1134		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';~~
1135		~~- $form .= wfElement( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'edituser-dosearch' ) ) );~~
1136		~~- $form .= wfElement( 'input', array( 'type' => 'hidden', 'name' => 'issearch', 'value' => '1' ) );~~
1137		~~- $form .= wfCloseElement( 'form' );~~
	1132	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
	1133	+ $form .= Xml::element( 'label', array( 'for' => 'username' ), wfMsg( 'edituser-username' ) ) . ' ';
	1134	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';
	1135	+ $form .= Xml::element( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'edituser-dosearch' ) ) );
	1136	+ $form .= Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'issearch', 'value' => '1' ) );
	1137	+ $form .= Xml::closeElement( 'form' );
1138	1138	return $form;
1139	1139	}
1140	1140	}
Index: trunk/extensions/ConfirmEdit/FancyCaptcha.class.php
—	—	@@ -57,19 +57,19 @@
58	58	$title = Title::makeTitle( NS_SPECIAL, 'Captcha/image' );
59	59
60	60	return "<p>" .
61		~~- wfElement( 'img', array(~~
	61	+ Xml::element( 'img', array(
62	62	'src' => $title->getLocalUrl( 'wpCaptchaId=' . urlencode( $index ) ),
63	63	'width' => $info['width'],
64	64	'height' => $info['height'],
65	65	'alt' => '' ) ) .
66	66	"</p>\n" .
67		~~- wfElement( 'input', array(~~
	67	+ Xml::element( 'input', array(
68	68	'type' => 'hidden',
69	69	'name' => 'wpCaptchaId',
70	70	'id' => 'wpCaptchaId',
71	71	'value' => $index ) ) .
72	72	"<p>" .
73		~~- wfElement( 'input', array(~~
	73	+ Xml::element( 'input', array(
74	74	'name' => 'wpCaptchaWord',
75	75	'id' => 'wpCaptchaWord',
76	76	'tabindex' => 1 ) ) . // tab in before the edit textarea
Index: trunk/extensions/ConfirmEdit/ConfirmEdit_body.php
—	—	@@ -102,12 +102,12 @@
103	103	$index = $this->storeCaptcha( $captcha );
104	104
105	105	return "<p><label for=\"wpCaptchaWord\">{$captcha['question']}</label> = " .
106		~~- wfElement( 'input', array(~~
	106	+ Xml::element( 'input', array(
107	107	'name' => 'wpCaptchaWord',
108	108	'id' => 'wpCaptchaWord',
109	109	'tabindex' => 1 ) ) . // tab in before the edit textarea
110	110	"</p>\n" .
111		~~- wfElement( 'input', array(~~
	111	+ Xml::element( 'input', array(
112	112	'type' => 'hidden',
113	113	'name' => 'wpCaptchaId',
114	114	'id' => 'wpCaptchaId',
Index: trunk/extensions/ConfirmEdit/MathCaptcha.class.php
—	—	@@ -22,8 +22,8 @@
23	23	$index = $this->storeCaptcha( array( 'answer' => $answer ) );
24	24
25	25	$form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
26		~~- $form .= '<td>' . wfInput( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';~~
27		~~- $form .= wfHidden( 'wpCaptchaId', $index );~~
	26	+ $form .= '<td>' . Xml::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
	27	+ $form .= Xml::hidden( 'wpCaptchaId', $index );
28	28	return $form;
29	29	}
30	30
Index: trunk/extensions/OAI/OAIRepo_body.php
—	—	@@ -955,7 +955,7 @@
956	956	function openStream() {
957	957	global $wgContLanguageCode;
958	958	$ver = "0.1";
959		~~- return wfElement( 'mediawiki', array(~~
	959	+ return Xml::element( 'mediawiki', array(
960	960	'xmlns' => "http://www.mediawiki.org/xml/lsearch-$ver/",
961	961	'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
962	962	'xsi:schemaLocation' => "http://www.mediawiki.org/xml/lsearch-$ver/ " .
—	—	@@ -970,7 +970,7 @@
971	971	function openPage( $row ) {
972	972	$out = parent::openPage( $row );
973	973	if(isset($row->num_page_ref))
974		~~- $out .= ' ' . wfElement( 'references', array(), strval( $row->num_page_ref ) ) . "\n";~~
	974	+ $out .= ' ' . Xml::element( 'references', array(), strval( $row->num_page_ref ) ) . "\n";
975	975	return $out;
976	976	}
977	977
—	—	@@ -980,9 +980,9 @@
981	981	foreach($this->_redirects[$row->up_page] as $row){
982	982	$title = Title::makeTitle( $row->page_namespace, $row->page_title );
983	983	$out .= " <redirect>\n";
984		~~- $out .= ' ' . wfElementClean( 'title', array(), $title->getPrefixedText() ) . "\n";~~
	984	+ $out .= ' ' . Xml::elementClean( 'title', array(), $title->getPrefixedText() ) . "\n";
985	985	if(isset($row->num_page_ref))
986		~~- $out .= ' ' . wfElement( 'references', array(), strval( $row->num_page_ref ) ) . "\n";~~
	986	+ $out .= ' ' . Xml::element( 'references', array(), strval( $row->num_page_ref ) ) . "\n";
987	987	$out .= " </redirect>\n";
988	988	}
989	989	}
Index: trunk/extensions/ConfirmAccount/RequestAccount_body.php
—	—	@@ -99,7 +99,7 @@
100	100
101	101	$titleObj = Title::makeTitle( NS_SPECIAL, 'RequestAccount' );
102	102
103		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'name' => 'accountrequest',~~
	103	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'name' => 'accountrequest',
104	104	'action' => $titleObj->getLocalUrl(), 'enctype' => 'multipart/form-data' ) );
105	105	$form .= '<fieldset><legend>' . wfMsgHtml('requestaccount-leg-user') . '</legend>';
106	106	$form .= wfMsgExt( 'requestaccount-acc-text', array('parse') )."\n";
—	—	@@ -215,7 +215,7 @@
216	216	$form .= Xml::hidden( 'attachment', $this->mPrevAttachment )."\n";
217	217	$form .= Xml::hidden( 'forgotAttachment', $this->mForgotAttachment )."\n";
218	218	$form .= "<p>".Xml::submitButton( wfMsgHtml( 'requestaccount-submit') )."</p>";
219		~~- $form .= wfCloseElement( 'form' );~~
	219	+ $form .= Xml::closeElement( 'form' );
220	220
221	221	$wgOut->addHTML( $form );
222	222
Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php
—	—	@@ -215,7 +215,7 @@
216	216	$reason . '</i></p>' );
217	217	}
218	218
219		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'name' => 'accountconfirm',~~
	219	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'name' => 'accountconfirm',
220	220	'action' => $titleObj->getLocalUrl() ) );
221	221	$form .= "<fieldset>";
222	222	$form .= '<legend>' . wfMsgHtml('confirmaccount-leg-user') . '</legend>';
—	—	@@ -338,7 +338,7 @@
339	339	$form .= Xml::hidden( 'acrid', $row->acr_id );
340	340	$form .= Xml::hidden( 'wpShowRejects', $this->showRejects );
341	341	$form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() )."\n";
342		~~- $form .= wfCloseElement( 'form' );~~
	342	+ $form .= Xml::closeElement( 'form' );
343	343
344	344	$wgOut->addHTML( $form );
345	345
Index: trunk/extensions/EmailPage/EmailPage_body.php
—	—	@@ -56,7 +56,7 @@
57	57
58	58	# Render form
59	59	$special = Title::makeTitle(NS_SPECIAL, 'EmailPage');
60		~~- $wgOut->addHTML(wfElement('form',array(~~
	60	+ $wgOut->addHTML(Xml::element('form',array(
61	61	'class' => 'EmailPage',
62	62	'action' => $special->getLocalURL('action=submit'),
63	63	'method' => 'POST'
—	—	@@ -104,7 +104,7 @@
105	105
106	106	# Subject
107	107	$wgOut->addWikiText(wfMsg('ea-subject'));
108		~~- $wgOut->addHTML(wfElement('input',array('type' => 'text', 'name' => 'ea-subject', 'value' => $this->subject, 'style' => "width:100%")));~~
	108	+ $wgOut->addHTML(Xml::element('input',array('type' => 'text', 'name' => 'ea-subject', 'value' => $this->subject, 'style' => "width:100%")));
109	109
110	110	# Header
111	111	$wgOut->addWikiText(wfMsg('ea-header'));
—	—	@@ -143,9 +143,9 @@
144	144	$wgOut->addHTML("</fieldset>");
145	145
146	146	# Submit buttons & hidden values
147		~~- $wgOut->addHTML(wfElement('input', array('type' => 'submit', 'name' => 'ea-send', 'value' => wfMsg('ea-send'))));~~
148		~~- $wgOut->addHTML(wfElement('input', array('type' => 'submit', 'name' => 'ea-show', 'value' => wfMsg('ea-show'))));~~
149		~~- $wgOut->addHTML(wfElement('input', array('type' => 'hidden', 'name' => 'ea-title', 'value' => $this->title)));~~
	147	+ $wgOut->addHTML(Xml::element('input', array('type' => 'submit', 'name' => 'ea-send', 'value' => wfMsg('ea-send'))));
	148	+ $wgOut->addHTML(Xml::element('input', array('type' => 'submit', 'name' => 'ea-show', 'value' => wfMsg('ea-show'))));
	149	+ $wgOut->addHTML(Xml::element('input', array('type' => 'hidden', 'name' => 'ea-title', 'value' => $this->title)));
150	150
151	151	$wgOut->addHTML('</form>');
152	152
Index: trunk/extensions/AuthorProtect/AuthorProtect.php
—	—	@@ -122,7 +122,7 @@
123	123	global $wgRestrictionTypes, $wgTitle, $wgUser;
124	124	$token = $wgUser->editToken();
125	125	$form = '<p>' . wfMsg('authorprotect-intro') . '</p>';
126		~~- $form .= wfOpenElement( 'form', array( 'method' => 'post', 'action' => $wgTitle->getLocalUrl('action=authorprotect') ) );~~
	126	+ $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $wgTitle->getLocalUrl('action=authorprotect') ) );
127	127	foreach( $wgRestrictionTypes as $type ) {
128	128	$rest = $wgTitle->getRestrictions($type);
129	129	if( $rest !== array() ) {
—	—	@@ -133,16 +133,16 @@
134	134	$array = array( 'type' => 'checkbox', 'name' => 'check-' . $type, 'value' => $type );
135	135	if($checked)
136	136	$array = array_merge( $array, array( 'checked' => 'checked' ) );
137		~~- $form .= wfElement( 'input', $array );~~
138		~~- $form .= ' ' . wfMsg('authorprotect-' . $type) . wfElement( 'br' );~~
	137	+ $form .= Xml::element( 'input', $array );
	138	+ $form .= ' ' . wfMsg('authorprotect-' . $type) . Xml::element( 'br' );
139	139	}
140		~~- $form .= wfElement( 'br' ) . wfElement( 'label', array( 'for' => 'wpExpiryTime' ), wfMsg('authorprotect-expiry') ) . ' ';~~
141		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'wpExpiryTime' ) ) . wfElement( 'br' );~~
142		~~- $form .= wfElement( 'br' ) . wfElement( 'label', array( 'for' => 'wpReason' ), wfMsg('authorprotect-reason') ) . ' ';~~
143		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'wpReason' ) );~~
144		~~- $form .= wfElement( 'br' ) . wfElement( 'input', array( 'type' => 'hidden', 'name' => 'wpToken', 'value' => $token ) );~~
145		~~- $form .= wfElement( 'br' ) . wfElement( 'input', array( 'type' => 'submit', 'name' => 'wpConfirm', 'value' => wfMsg( 'authorprotect-confirm' ) ) );~~
146		~~- $form .= wfCloseElement( 'form' );~~
	140	+ $form .= Xml::element( 'br' ) . Xml::element( 'label', array( 'for' => 'wpExpiryTime' ), wfMsg('authorprotect-expiry') ) . ' ';
	141	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'wpExpiryTime' ) ) . Xml::element( 'br' );
	142	+ $form .= Xml::element( 'br' ) . Xml::element( 'label', array( 'for' => 'wpReason' ), wfMsg('authorprotect-reason') ) . ' ';
	143	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'wpReason' ) );
	144	+ $form .= Xml::element( 'br' ) . Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'wpToken', 'value' => $token ) );
	145	+ $form .= Xml::element( 'br' ) . Xml::element( 'input', array( 'type' => 'submit', 'name' => 'wpConfirm', 'value' => wfMsg( 'authorprotect-confirm' ) ) );
	146	+ $form .= Xml::closeElement( 'form' );
147	147	return $form;
148	148	}
149	149
—	—	@@ -283,4 +283,4 @@
284	284	function isAuthorProtected($title, $action) {
285	285	$rest = $title->getRestrictions($action);
286	286	return in_array('author', $rest);
287		-}
\ No newline at end of file
	287	+}
Index: trunk/extensions/Crosswiki/Block/CrosswikiBlock.page.php
—	—	@@ -188,7 +188,7 @@
189	189	<tr id='wpAnonOnlyRow'>
190	190	<td> </td>
191	191	<td>
192		~~- " . wfCheckLabel( wfMsgHtml( 'crosswikiblock-anononly' ),~~
	192	+ " . Xml::checkLabel( wfMsgHtml( 'crosswikiblock-anononly' ),
193	193	'wpAnonOnly', 'wpAnonOnly', $wgRequest->getCheck( 'wpAnonOnly' ),
194	194	array( 'tabindex' => '6' ) ) . "
195	195	</td>
—	—	@@ -196,7 +196,7 @@
197	197	<tr id='wpCreateAccountRow'>
198	198	<td> </td>
199	199	<td>
200		~~- " . wfCheckLabel( wfMsgHtml( 'crosswikiblock-nocreate' ),~~
	200	+ " . Xml::checkLabel( wfMsgHtml( 'crosswikiblock-nocreate' ),
201	201	'wpCreateAccount', 'wpCreateAccount', $wgRequest->getCheck( 'wpAnonOnly' ),
202	202	array( 'tabindex' => '7' ) ) . "
203	203	</td>
—	—	@@ -204,7 +204,7 @@
205	205	<tr id='wpEnableAutoblockRow'>
206	206	<td> </td>
207	207	<td>
208		~~- " . wfCheckLabel( wfMsgHtml( 'crosswikiblock-autoblock' ),~~
	208	+ " . Xml::checkLabel( wfMsgHtml( 'crosswikiblock-autoblock' ),
209	209	'wpEnableAutoblock', 'wpEnableAutoblock', $wgRequest->getCheck( 'wpAnonOnly' ),
210	210	array( 'tabindex' => '8' ) ) . "
211	211	</td>
—	—	@@ -216,7 +216,7 @@
217	217	<tr id='wpEnableEmailBan'>
218	218	<td> </td>
219	219	<td>
220		~~- " . wfCheckLabel( wfMsgHtml( 'crosswikiblock-noemail' ),~~
	220	+ " . Xml::checkLabel( wfMsgHtml( 'crosswikiblock-noemail' ),
221	221	'wpEmailBan', 'wpEmailBan', $wgRequest->getCheck( 'wpEmailBan' ),
222	222	array( 'tabindex' => '10' )) . "
223	223	</td>
Index: trunk/extensions/RecordAdmin/RecordAdmin_body.php
—	—	@@ -65,9 +65,9 @@
66	66	while ( $row = $dbr->fetchRow( $res ) ) $options .= '<option>' . Title::newFromID( $row[0] )->getText() . '</option>';
67	67
68	68	# Render type-selecting form
69		~~- $wgOut->addHTML( wfElement( 'form', array( 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null )~~
	69	+ $wgOut->addHTML( Xml::element( 'form', array( 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null )
70	70	. "<select name='wpType'>$options</select> "
71		~~- . wfElement( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'recordadmin-submit' ) ) )~~
	71	+ . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'recordadmin-submit' ) ) )
72	72	. '</form>'
73	73	);
74	74	}
—	—	@@ -111,15 +111,15 @@
112	112
113	113	# Render the form
114	114	$wgOut->addHTML(
115		~~- wfElement( 'form', array( 'class' => strtolower($type).'-record', 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null )~~
116		~~- . '<b>' . wfMsg( 'recordadmin-recordid' ) . '</b> ' . wfElement( 'input', array( 'name' => 'wpTitle', 'size' => 30, 'value' => $wpTitle ) )~~
117		~~- . '   ' . wfElement( 'input', array( 'name' => 'wpInvert', 'type' => 'checkbox' ) ) . ' ' . wfMsg( 'recordadmin-invert' )~~
	115	+ Xml::element( 'form', array( 'class' => strtolower($type).'-record', 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null )
	116	+ . '<b>' . wfMsg( 'recordadmin-recordid' ) . '</b> ' . Xml::element( 'input', array( 'name' => 'wpTitle', 'size' => 30, 'value' => $wpTitle ) )
	117	+ . '   ' . Xml::element( 'input', array( 'name' => 'wpInvert', 'type' => 'checkbox' ) ) . ' ' . wfMsg( 'recordadmin-invert' )
118	118	. "\n<br><br><hr><br>\n{$this->form}"
119		~~- . wfElement( 'input', array( 'type' => 'hidden', 'name' => 'wpType', 'value' => $type ) )~~
	119	+ . Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'wpType', 'value' => $type ) )
120	120	. '<br><hr><br><table width="100%"><tr>'
121		~~- . '<td>' . wfElement( 'input', array( 'type' => 'submit', 'name' => 'wpFind', 'value' => wfMsg( 'recordadmin-buttonsearch' ) ) ) . '</td>'~~
122		~~- . '<td>' . wfElement( 'input', array( 'type' => 'submit', 'name' => 'wpCreate', 'value' => wfMsg( 'recordadmin-buttoncreate' ) ) ) . '</td>'~~
123		~~- . '<td width="100%" align="left">' . wfElement( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'recordadmin-buttonreset' ) ) ) . '</td>'~~
	121	+ . '<td>' . Xml::element( 'input', array( 'type' => 'submit', 'name' => 'wpFind', 'value' => wfMsg( 'recordadmin-buttonsearch' ) ) ) . '</td>'
	122	+ . '<td>' . Xml::element( 'input', array( 'type' => 'submit', 'name' => 'wpCreate', 'value' => wfMsg( 'recordadmin-buttoncreate' ) ) ) . '</td>'
	123	+ . '<td width="100%" align="left">' . Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'recordadmin-buttonreset' ) ) ) . '</td>'
124	124	. '</tr></table></form>'
125	125	);
126	126
—	—	@@ -233,13 +233,13 @@
234	234	$this->populateForm( substr( $text, $braces['OFFSET'], $braces['LENGTH'] ) );
235	235
236	236	# Render the form
237		~~- $wgOut->addHTML( wfElement( 'form', array( 'class' => 'recordadmin', 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null ) );~~
	237	+ $wgOut->addHTML( Xml::element( 'form', array( 'class' => 'recordadmin', 'action' => $title->getLocalURL( 'action=submit' ), 'method' => 'post' ), null ) );
238	238	$wgOut->addHTML( $this->form );
239		~~- $wgOut->addHTML( wfElement( 'input', array( 'type' => 'hidden', 'name' => 'wpType', 'value' => $type ) ) );~~
240		~~- $wgOut->addHTML( wfElement( 'input', array( 'type' => 'hidden', 'name' => 'wpRecord', 'value' => $record ) ) );~~
	239	+ $wgOut->addHTML( Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'wpType', 'value' => $type ) ) );
	240	+ $wgOut->addHTML( Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'wpRecord', 'value' => $record ) ) );
241	241	$wgOut->addHTML( '<br><hr><br><table width="100%"><tr>'
242		~~- . '<td>' . wfElement( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'recordadmin-buttonsave' ) ) ) . '</td>'~~
243		~~- . '<td width="100%" align="left">' . wfElement( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'recordadmin-buttonreset' ) ) ) . '</td>'~~
	242	+ . '<td>' . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'recordadmin-buttonsave' ) ) ) . '</td>'
	243	+ . '<td width="100%" align="left">' . Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'recordadmin-buttonreset' ) ) ) . '</td>'
244	244	. '</tr></table></form>'
245	245	);
246	246	}
Index: trunk/extensions/Tasks/Tasks.php
—	—	@@ -1560,7 +1560,7 @@
1561	1561	if( $checked ) {
1562	1562	$attribs['checked'] = 'checked';
1563	1563	}
1564		~~- return wfElement( 'input', $attribs );~~
	1564	+ return Xml::element( 'input', $attribs );
1565	1565	}
1566	1566	} # end of class
1567	1567
Index: trunk/extensions/LiquidThreads/LqtBaseView.php
—	—	@@ -1034,11 +1034,11 @@
1035	1035	}
1036	1036
1037	1037	function openDiv( $class='', $id='' ) {
1038		~~- $this->output->addHTML( wfOpenElement( 'div', array('class'=>$class, 'id'=>$id) ) );~~
	1038	+ $this->output->addHTML( Xml::openElement( 'div', array('class'=>$class, 'id'=>$id) ) );
1039	1039	}
1040	1040
1041	1041	function closeDiv() {
1042		~~- $this->output->addHTML( wfCloseElement( 'div' ) );~~
	1042	+ $this->output->addHTML( Xml::closeElement( 'div' ) );
1043	1043	}
1044	1044
1045	1045	function showSummary($t) {
Index: trunk/extensions/LiquidThreads/LqtPages.php
—	—	@@ -71,13 +71,13 @@
72	72	}
73	73
74	74	function outputList( $kind, $class, $id, $contents ) {
75		~~- $this->output->addHTML(wfOpenElement($kind, array('class'=>$class,'id'=>$id)));~~
	75	+ $this->output->addHTML(Xml::openElement($kind, array('class'=>$class,'id'=>$id)));
76	76	foreach ($contents as $li) {
77		~~- $this->output->addHTML( wfOpenElement('li') );~~
	77	+ $this->output->addHTML( Xml::openElement('li') );
78	78	$this->output->addHTML( $li );
79		~~- $this->output->addHTML( wfCloseElement('li') );~~
	79	+ $this->output->addHTML( Xml::closeElement('li') );
80	80	}
81		~~- $this->output->addHTML(wfCloseElement($kind));~~
	81	+ $this->output->addHTML(Xml::closeElement($kind));
82	82	}
83	83
84	84	function showTOC($threads) {
Index: trunk/extensions/FixedImage/FixedImage.php
—	—	@@ -71,5 +71,5 @@
72	72	*/
73	73	function fixedImageHandler( $key, $text, $params=null ) {
74	74	global $wgFixedImageHooks;
75		~~- return wfElement( 'img', $wgFixedImageHooks[$key] );~~
	75	+ return Xml::element( 'img', $wgFixedImageHooks[$key] );
76	76	}
Index: trunk/extensions/Eval/SpecialEval.php
—	—	@@ -158,9 +158,9 @@
159	159	$wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'eval_out' ) ) );
160	160	if ( $this->mEscape )
161	161	$this->mErr =
162		~~- wfOpenElement( 'pre' ) .~~
	162	+ Xml::openElement( 'pre' ) .
163	163	htmlspecialchars( $this->mErr ) .
164		~~- wfCloseElement( 'pre ' );~~
	164	+ Xml::closeElement( 'pre ' );
165	165	$wgOut->addHTML( $this->mErr );
166	166	}
167	167	}
Index: trunk/extensions/SignDocument/SpecialCreateSignDocument.php
—	—	@@ -92,7 +92,7 @@
93	93	$ret = '';
94	94	$selectedAttr = array( 'selected' => 'selected' );
95	95	foreach ( $arr as $a ) {
96		~~- $ret .= wfElement( 'option', array(~~
	96	+ $ret .= Xml::element( 'option', array(
97	97	'value' => $a) + $selectedAttr, $a );
98	98	$selectedAttr = array();
99	99	}
Index: trunk/extensions/SignDocument/SpecialSignDocument.php
—	—	@@ -60,7 +60,7 @@
61	61	$wgOut->addWikiText( wfMsg( 'sign-nodocselected' ) );
62	62
63	63	$out = '';
64		~~- $out .= wfOpenElement( 'form', array(~~
	64	+ $out .= Xml::openElement( 'form', array(
65	65	'id' => 'mw-SignDocument-SelectDoc-form',
66	66	'action' => $wgTitle->escapeLocalUrl(),
67	67	'method' => 'get') );
—	—	@@ -69,7 +69,7 @@
70	70
71	71	$out .= $this->buildDocSelector();
72	72
73		~~- $out .= wfElement( 'input', array(~~
	73	+ $out .= Xml::element( 'input', array(
74	74	'id' => 'mw-SelectDoc-submit',
75	75	'type' => 'submit',
76	76	'value' => wfMsg( 'go' ) ) );
—	—	@@ -88,7 +88,7 @@
89	89	'size' => '1',
90	90	);
91	91
92		~~- $out = wfOpenElement( 'select', $attribs );~~
	92	+ $out = Xml::openElement( 'select', $attribs );
93	93
94	94	$itms = SignDocumentForm::getNamesFromDB();
95	95	$firstItem = null;
—	—	@@ -107,7 +107,7 @@
108	108	? array( 'selected' => 'selected' )
109	109	: array();
110	110
111		~~- return wfElement( 'option',~~
	111	+ return Xml::element( 'option',
112	112	array( 'value' => $value ) + $selectedAttrib,
113	113	$text );
114	114	}
—	—	@@ -166,7 +166,7 @@
167	167
168	168	$out = '';
169	169
170		~~- $out .= wfOpenElement( 'form', array(~~
	170	+ $out .= Xml::openElement( 'form', array(
171	171	'id' => 'mw-SignDocument-sign-form',
172	172	'action' => $wgTitle->escapeLocalUrl(),
173	173	'method' => 'post') );
—	—	@@ -211,13 +211,13 @@
212	212	$out .= '<tr><td></td><td>' . wfMsg( 'sign-indicates-req' ) . '</td></tr>';
213	213	$out .= '<tr><td></td><td>' . wfMsg( 'sign-hide-note' ) . '</td></tr>';
214	214
215		~~- $out .= wfElement( 'input', array(~~
	215	+ $out .= Xml::element( 'input', array(
216	216
217	217	'type' => 'hidden',
218	218	'name' => 'doc',
219	219	'value' => $wgRequest->getVal('doc') ) );
220	220
221		~~- $out .= '<tr><td>' . wfElement( 'input', array(~~
	221	+ $out .= '<tr><td>' . Xml::element( 'input', array(
222	222	'id' => 'mwSignDocument-submit',
223	223	'type' => 'submit',
224	224	'value' => wfMsg( 'sign-submit') ) );
—	—	@@ -235,7 +235,7 @@
236	236	if (!$optional) $caption .= '<font color="red">*</font>';
237	237	$out .= "<strong>$caption ";
238	238	$out .= '</td><td>';
239		~~- $out .= wfElement( 'input', array(~~
	239	+ $out .= Xml::element( 'input', array(
240	240	'id' => "wmSignDocument-$name",
241	241	'name' => $name,
242	242	'value' => $value,
—	—	@@ -376,27 +376,27 @@
377	377	$url = $wgTitle->escapeLocalUrl() . '?doc=' . $this->mForm->getId()
378	378	. '&viewsigs';
379	379
380		~~- $out = wfOpenElement( 'form', array(~~
	380	+ $out = Xml::openElement( 'form', array(
381	381	'id' => 'wm-sign-viewsigs-closeopen-form',
382	382	'action' => $url,
383	383	'method' => 'post' ) );
384	384
385	385	if ( $this->mForm->mOpen ) {
386	386	$out .= wfMsg('sign-sigadmin-currentlyopen') . ' ';
387		~~- $out .= wfElement( 'input', array(~~
	387	+ $out .= Xml::element( 'input', array(
388	388	'type' => 'submit',
389	389	'name' => 'closesigning-submit',
390	390	'value' => wfMsg( 'sign-sigadmin-close' ) ) );
391		~~- $out .= wfElement( 'input', array(~~
	391	+ $out .= Xml::element( 'input', array(
392	392	'type' => 'hidden',
393	393	'name' => 'closesigning') );
394	394	} else {
395	395	$out .= wfMsg('sign-sigadmin-currentlyclosed') . ' ';
396		~~- $out .= wfElement( 'input', array(~~
	396	+ $out .= Xml::element( 'input', array(
397	397	'type' => 'submit',
398	398	'name' => 'opensigning-submit',
399	399	'value' => wfMsg( 'sign-sigadmin-open' ) ) );
400		~~- $out .= wfElement( 'input', array(~~
	400	+ $out .= Xml::element( 'input', array(
401	401	'type' => 'hidden',
402	402	'name' => 'opensigning') );
403	403	}
—	—	@@ -408,24 +408,24 @@
409	409	private function getFieldSelector() {
410	410	global $wgTitle;
411	411	$out = '';
412		~~- $out .= wfOpenElement( 'form', array(~~
	412	+ $out .= Xml::openElement( 'form', array(
413	413	'id' => 'mw-sdoc-viewsigs-fieldselector-form',
414	414	'action' => $wgTitle->escapeLocalUrl(),
415	415	'method' => 'get') );
416	416
417	417	$out .= wfMsg( 'sign-view-selectfields' );
418	418
419		~~- $out .= wfElement( 'input', array(~~
	419	+ $out .= Xml::element( 'input', array(
420	420	'type' => 'hidden', 'name' => 'doc',
421	421	'value' => $this->mForm->getId()));
422	422
423		~~- $out .= wfElement( 'input', array(~~
	423	+ $out .= Xml::element( 'input', array(
424	424	'type' => 'hidden', 'name' => 'viewsigs'));
425	425
426	426	foreach (array_keys($this->mFields) as $field)
427	427	$out .= $this->fieldCheck($field);
428	428
429		~~- $out .= ' ' . wfElement( 'input', array(~~
	429	+ $out .= ' ' . Xml::element( 'input', array(
430	430	'type' => 'submit', 'value' => wfMsg('go') ) );
431	431
432	432	$out .= '</form>';
—	—	@@ -536,7 +536,7 @@
537	537	$url = $wgTitle->escapeLocalUrl() . '?doc=' . $wgRequest->getVal('doc')
538	538	. '&viewsigs&detail=' . $wgRequest->getVal('detail');
539	539
540		~~- $out .= wfOpenElement( 'form', array(~~
	540	+ $out .= Xml::openElement( 'form', array(
541	541	'id' => 'doreview-form',
542	542	'action' => $url,
543	543	'method' => 'post' ) );
—	—	@@ -550,13 +550,13 @@
551	551	$sig->mStricken);
552	552
553	553	$out .= '  ' . wfMsg( 'sign-review-comment' ) . ': ';
554		~~- $out .= wfElement( 'input', array(~~
	554	+ $out .= Xml::element( 'input', array(
555	555	'type' => 'text',
556	556	'name' => 'reviewcomment',
557	557	'value' => $sig->mStrickenComment,
558	558	'style' => 'width: 450px;' ) );
559	559
560		~~- $out .= '  ' . wfElement( 'input', array(~~
	560	+ $out .= '  ' . Xml::element( 'input', array(
561	561	'type' => 'submit',
562	562	'name' => 'doreview',
563	563	'value' => wfMsg( 'sign-submitreview' ) ) );
—	—	@@ -632,12 +632,12 @@
633	633	if ( !$wgRequest->wasPosted() \|\| !$wgRequest->getVal( 'rununiquequery' ) ) {
634	634	$url = $wgTitle->escapeLocalUrl() . '?doc=' . $wgRequest->getVal('doc')
635	635	. '&viewsigs&detail=' . $wgRequest->getVal('detail');
636		~~- $out .= wfOpenElement( 'form', array(~~
	636	+ $out .= Xml::openElement( 'form', array(
637	637	'id' => 'rununiquequery-form',
638	638	'action' => $url,
639	639	'method' => 'post' ) );
640	640
641		~~- $out .= wfElement( 'input', array(~~
	641	+ $out .= Xml::element( 'input', array(
642	642	'type' => 'submit',
643	643	'name' => 'rununiquequery',
644	644	'value'=> wfMsg( 'sign-detail-uniquequery-run' ) ) );
Index: trunk/extensions/SpecialForm/SpecialForm.body.php
—	—	@@ -94,25 +94,25 @@
95	95
96	96	if (!is_null($form->instructions)) {
97	97
98		~~- $wgOut->addHTML(wfOpenElement('div', array('class' => 'instructions')) .~~
	98	+ $wgOut->addHTML(Xml::openElement('div', array('class' => 'instructions')) .
99	99	$wgOut->parse($form->instructions) .
100		~~- wfCloseElement('div') .~~
101		~~- wfElement('br'));~~
	100	+ Xml::closeElement('div') .
	101	+ Xml::element('br'));
102	102	}
103	103
104	104	if (!is_null($errmsg)) {
105		~~- $wgOut->addHTML(wfOpenElement('div', array('class' => 'error')) .~~
	105	+ $wgOut->addHTML(Xml::openElement('div', array('class' => 'error')) .
106	106	$wgOut->parse($errmsg) .
107		~~- wfCloseElement('div') .~~
108		~~- wfElement('br'));~~
	107	+ Xml::closeElement('div') .
	108	+ Xml::element('br'));
109	109	}
110	110
111		~~- $wgOut->addHTML(wfOpenElement('form',~~
	111	+ $wgOut->addHTML(Xml::openElement('form',
112	112	array('method' => 'POST',
113	113	'action' => $self->getLocalURL())));
114	114
115	115	foreach ($form->fields as $field) {
116		~~- $wgOut->addHTML($field->render($wgRequest->getText($field->name)) . wfElement('br') . "\n");~~
	116	+ $wgOut->addHTML($field->render($wgRequest->getText($field->name)) . Xml::element('br') . "\n");
117	117	}
118	118
119	119	if ($wgUser->getId() == 0 && $wgSpecialFormRecaptcha) { # Anonymous user, use recaptcha
—	—	@@ -121,10 +121,10 @@
122	122	$wgOut->addHTML(recaptcha_get_html($recaptcha_public_key));
123	123	}
124	124
125		~~- $wgOut->addHTML(wfElement('input', array('type' => 'submit',~~
	125	+ $wgOut->addHTML(Xml::element('input', array('type' => 'submit',
126	126	'value' => wfMsg('formsave'))));
127	127
128		~~- $wgOut->addHTML(wfCloseElement('form'));~~
	128	+ $wgOut->addHTML(Xml::closeElement('form'));
129	129	}
130	130
131	131	function createArticle($form) {
—	—	@@ -436,21 +436,21 @@
437	437
438	438	switch ($this->type) {
439	439	case 'textarea':
440		~~- return wfOpenElement('h2') .~~
441		~~- wfElement('label', array('for' => $this->name), $this->label) .~~
442		~~- wfCloseElement('h2') .~~
	440	+ return Xml::openElement('h2') .
	441	+ Xml::element('label', array('for' => $this->name), $this->label) .
	442	+ Xml::closeElement('h2') .
443	443	(($this->description) ?
444		~~- (wfOpenElement('div') . $wgOut->parse($this->description) . wfCloseElement('div')) : '') .~~
445		~~- wfOpenElement('textarea', array('name' => $this->name,~~
	444	+ (Xml::openElement('div') . $wgOut->parse($this->description) . Xml::closeElement('div')) : '') .
	445	+ Xml::openElement('textarea', array('name' => $this->name,
446	446	'id' => $this->name,
447	447	'rows' => $this->getOption('rows', 6),
448	448	'cols' => $this->getOption('cols', 80))) .
449	449	((is_null($def)) ? '' : $def) .
450		~~- wfCloseElement('textarea');~~
	450	+ Xml::closeElement('textarea');
451	451	break;
452	452	case 'text':
453		~~- return wfElement('label', array('for' => $this->name), $this->label) . ": " .~~
454		~~- wfElement('input', array('type' => 'text',~~
	453	+ return Xml::element('label', array('for' => $this->name), $this->label) . ": " .
	454	+ Xml::element('input', array('type' => 'text',
455	455	'name' => $this->name,
456	456	'id' => $this->name,
457	457	'value' => ((is_null($def)) ? '' : $def),
—	—	@@ -463,8 +463,8 @@
464	464	if ($def == 'checked') {
465	465	$attrs['checked'] = 'checked';
466	466	}
467		~~- return wfElement('label', array('for' => $this->name), $this->label) . ": " .~~
468		~~- wfElement('input', $attrs);~~
	467	+ return Xml::element('label', array('for' => $this->name), $this->label) . ": " .
	468	+ Xml::element('input', $attrs);
469	469	break;
470	470	case 'radio':
471	471	$items = array();
—	—	@@ -476,25 +476,25 @@
477	477	if ($item == $def) {
478	478	$attrs['checked'] = 'checked';
479	479	}
480		~~- $items[] = wfOpenElement('input', $attrs) .~~
481		~~- wfElement('label', null, $item) .~~
482		~~- wfCloseElement('input');~~
	480	+ $items[] = Xml::openElement('input', $attrs) .
	481	+ Xml::element('label', null, $item) .
	482	+ Xml::closeElement('input');
483	483	}
484		~~- return wfElement('span', null, $this->label) . wfElement('br') . implode("", $items);~~
	484	+ return Xml::element('span', null, $this->label) . Xml::element('br') . implode("", $items);
485	485	break;
486	486	case 'select':
487	487	$items = array();
488	488	$rawitems = explode(';', $this->getOption('items'));
489	489	foreach ($rawitems as $item) {
490		~~- $items[] = wfElement('option',~~
	490	+ $items[] = Xml::element('option',
491	491	($item == $def) ? array('selected' => 'selected') : null,
492	492	$item);
493	493	}
494	494
495		~~- return wfElement('label', array('for' => $this->name), $this->label) . ": " .~~
496		~~- wfOpenElement('select', array('name' => $this->name, 'id' => $this->name)) .~~
	495	+ return Xml::element('label', array('for' => $this->name), $this->label) . ": " .
	496	+ Xml::openElement('select', array('name' => $this->name, 'id' => $this->name)) .
497	497	implode("", $items) .
498		~~- wfCloseElement('select');~~
	498	+ Xml::closeElement('select');
499	499
500	500	break;
501	501	default:
Index: trunk/extensions/Aggregator/Aggregator.php
—	—	@@ -61,7 +61,7 @@
62	62	class AggregatorStyleHandler {
63	63	function apply( $outputPage ) {
64	64	global $wgScriptPath;
65		~~- $outputPage->addScript( wfElement( 'link', array(~~
	65	+ $outputPage->addScript( Xml::element( 'link', array(
66	66	'rel' => 'stylesheet',
67	67	'type' => 'text/css',
68	68	'href' => "$wgScriptPath/extensions/Aggregator/inline-feed.css" ) ) );
—	—	@@ -86,7 +86,7 @@
87	87
88	88	function _feedLink( $type, $mime ) {
89	89	$special = wfAggregatorFeedPage( $this->mName, $type );
90		~~- $link = wfElement( 'link', array(~~
	90	+ $link = Xml::element( 'link', array(
91	91	'rel' => 'alternate',
92	92	'type' => $mime,
93	93	'href' => $special->getLocalUrl() ) );
Index: trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
—	—	@@ -102,9 +102,9 @@
103	103	$html .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $wgScript, 'name' => 'centralauth-globalgroups-newgroup' ) );
104	104	$html .= Xml::hidden( 'title', SpecialPage::getTitleFor('GlobalGroupPermissions')->getPrefixedText() );
105	105
106		~~- $fields = array( 'centralauth-globalgroupperms-newgroupname' => wfInput( 'wpGroup' ) );~~
	106	+ $fields = array( 'centralauth-globalgroupperms-newgroupname' => Xml::input( 'wpGroup' ) );
107	107
108		~~- $html .= wfBuildForm( $fields, 'centralauth-globalgroupperms-creategroup-submit' );~~
	108	+ $html .= Xml::buildForm( $fields, 'centralauth-globalgroupperms-creategroup-submit' );
109	109	$html .= Xml::closeElement( 'form' );
110	110	$html .= Xml::closeElement( 'fieldset' );
111	111
—	—	@@ -129,9 +129,9 @@
130	130	$fields['centralauth-editgroup-members'] = wfMsgExt( 'centralauth-editgroup-members-link', array( 'parseinline' ), $group, User::getGroupMember( $group ) );
131	131	$fields['centralauth-editgroup-restrictions'] = $this->buildWikiSetSelector($group);
132	132	$fields['centralauth-editgroup-perms'] = $this->buildCheckboxes($group);
133		~~- $fields['centralauth-editgroup-reason'] = wfInput( 'wpReason' );~~
	133	+ $fields['centralauth-editgroup-reason'] = Xml::input( 'wpReason' );
134	134
135		~~- $html .= wfBuildForm( $fields, 'centralauth-editgroup-submit' );~~
	135	+ $html .= Xml::buildForm( $fields, 'centralauth-editgroup-submit' );
136	136
137	137	$html .= Xml::closeElement( 'form' );
138	138	$html .= Xml::closeElement( 'fieldset' );
Index: trunk/extensions/CentralAuth/SpecialCentralAuth.php
—	—	@@ -339,7 +339,7 @@
340	340	$hostname = $wiki->getDisplayName();
341	341	$userPageName = 'User:' . $this->mUserName;
342	342	$url = $wiki->getUrl( $userPageName );
343		~~- return wfElement( 'a',~~
	343	+ return Xml::element( 'a',
344	344	array(
345	345	'href' => $url,
346	346	'title' => wfMsg( 'centralauth-foreign-link',
Index: trunk/extensions/CentralAuth/SpecialMergeAccount.php
—	—	@@ -409,7 +409,7 @@
410	410	$hostname = $wiki->getDisplayName();
411	411	$userPageName = 'User:' . $this->mUserName;
412	412	$url = $wiki->getUrl( $userPageName );
413		~~- return wfElement( 'a',~~
	413	+ return Xml::element( 'a',
414	414	array(
415	415	'href' => $url,
416	416	'title' => wfMsg( 'centralauth-foreign-link',
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
—	—	@@ -777,7 +777,7 @@
778	778	# For a bit more sophisticated detection of blank summaries, hash the
779	779	# automatic one and pass that in a hidden field.
780	780	$autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
781		~~- $wgOut->addHTML( wfHidden( 'wpAutoSummary', $autosumm ) );~~
	781	+ $wgOut->addHTML( Xml::hidden( 'wpAutoSummary', $autosumm ) );
782	782
783	783	if ( $this->isConflict ) {
784	784	$wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
—	—	@@ -839,7 +839,7 @@
840	840	if ( $button_action != '' )
841	841	$temp['onMouseUp'] = sprintf( $button_action, 'save' );
842	842
843		~~- $buttons['save'] = wfElement( 'input', $temp, '' );~~
	843	+ $buttons['save'] = Xml::element( 'input', $temp, '' );
844	844
845	845	++$tabindex; // use the same for preview and live preview
846	846	if ( $wgLivePreview && $wgUser->getOption( 'uselivepreview' ) ) {
—	—	@@ -855,7 +855,7 @@
856	856	);
857	857	if ( $button_action != '' )
858	858	$temp['onMouseUp'] = sprintf( $button_action, 'preview' );
859		~~- $buttons['preview'] = wfElement( 'input', $temp, '' );~~
	859	+ $buttons['preview'] = Xml::element( 'input', $temp, '' );
860	860
861	861	$temp = array(
862	862	'id' => 'wpLivePreview',
—	—	@@ -869,7 +869,7 @@
870	870	);
871	871	if ( $button_action != '' )
872	872	$temp['onMouseUp'] = sprintf( $button_action, 'live' );
873		~~- $buttons['live'] = wfElement( 'input', $temp, '' );~~
	873	+ $buttons['live'] = Xml::element( 'input', $temp, '' );
874	874	} else {
875	875	$temp = array(
876	876	'id' => 'wpPreview_' . $this->mvd_id,
—	—	@@ -883,7 +883,7 @@
884	884	if ( $button_action != '' )
885	885	$temp['onMouseUp'] = sprintf( $button_action, 'preview' );
886	886
887		~~- $buttons['preview'] = wfElement( 'input', $temp, '' );~~
	887	+ $buttons['preview'] = Xml::element( 'input', $temp, '' );
888	888	$buttons['live'] = '';
889	889	}
890	890
—	—	@@ -898,7 +898,7 @@
899	899	);
900	900	if ( $button_action != '' )
901	901	$temp['onMouseUp'] = sprintf( $button_action, 'diff' );
902		~~- $buttons['diff'] = wfElement( 'input', $temp, '' );~~
	902	+ $buttons['diff'] = Xml::element( 'input', $temp, '' );
903	903
904	904	return $buttons;
905	905	}
—	—	@@ -916,4 +916,4 @@
917	917	// $wgOut->addHTML( '</div>' );
918	918	}
919	919	}
920		~~-?>~~
\ No newline at end of file
	920	+?>
Index: trunk/extensions/MetavidWiki/skins/mv_embed/cortado_iframe.php
—	—	@@ -68,7 +68,7 @@
69	69	/**
70	70	* JS escape function copied from MediaWiki's Xml::escapeJsString()
71	71	*/
72		~~-function wfEscapeJsString( $string ) {~~
	72	+function Xml::escapeJsString( $string ) {
73	73	// See ECMA 262 section 7.8.4 for string literal format
74	74	$pairs = array(
75	75	"\\" => "\\\\",
—	—	@@ -108,7 +108,7 @@
109	109	<title>cortado_embed</title>
110	110	<?if( !empty( $parent_domain ) ){?>
111	111	<script type="text/javascript">
112		~~- window.DOMAIN = '<?= wfEscapeJsString( $parent_domain ); ?>';~~
	112	+ window.DOMAIN = '<?= Xml::escapeJsString( $parent_domain ); ?>';
113	113	</script>
114	114	<?}?>
115	115	<style type="text/css">
Index: trunk/extensions/MiniPreview/MiniPreview.php
—	—	@@ -119,7 +119,7 @@
120	120
121	121	# Output
122	122	$mainwidth = ( $wgMiniPreviewThumbnailSize + 2 ) * 3 ;
123		~~- $html = wfOpenElement( 'div', array (~~
	123	+ $html = Xml::openElement( 'div', array (
124	124	'id' => 'MiniPreview',
125	125	'class' => 'MiniPreview_main',
126	126	'style' => "float:right;clear:right",
—	—	@@ -137,15 +137,15 @@
138	138	$t = Title::newFromDBkey( $ns . $p->source_title );
139	139	$mode = ( $p->from_category ? "category" : "gallery" ) ;
140	140
141		~~- $html .= wfOpenElement( 'div', array( 'class' => 'MiniPreview_'.$mode , 'width' => '100%' ) );~~
142		~~- $html .= wfElement( 'a' , array ( 'href' => $t->getLocalURL() ) , $t->getText() );~~
143		~~- $html .= wfOpenElement( 'table' , array( 'border' => '0' , 'cellpadding' => '0' , 'cellspacing' => '0' )); # CSS is just not up to this yet...~~
144		~~- $html .= wfOpenElement( 'tr' );~~
	141	+ $html .= Xml::openElement( 'div', array( 'class' => 'MiniPreview_'.$mode , 'width' => '100%' ) );
	142	+ $html .= Xml::element( 'a' , array ( 'href' => $t->getLocalURL() ) , $t->getText() );
	143	+ $html .= Xml::openElement( 'table' , array( 'border' => '0' , 'cellpadding' => '0' , 'cellspacing' => '0' )); # CSS is just not up to this yet...
	144	+ $html .= Xml::openElement( 'tr' );
145	145	$html .= wfMiniPreviewGetThumbnail ( $p->entry[0] , $image_data ) ;
146	146	$html .= wfMiniPreviewGetThumbnail ( $p->entry[1] , $image_data ) ;
147	147
148		~~- $html .= wfOpenElement( 'td' );~~
149		~~- $html .= wfOpenElement( 'div', array(~~
	148	+ $html .= Xml::openElement( 'td' );
	149	+ $html .= Xml::openElement( 'div', array(
150	150	'style' => "width:{$wgMiniPreviewThumbnailSize}px;height:{$wgMiniPreviewThumbnailSize}px;",
151	151	'class' => 'MiniPreview_count' ));
152	152	$html .= wfMsgExt( 'minipreview-files_in_'.$mode , array( 'parsemag' ), $p->image_count );
—	—	@@ -168,8 +168,8 @@
169	169	$divclass = ( $entry->id == 0 ) ? 'MiniPreview_no_thumb' : 'MiniPreview_thumb' ;
170	170
171	171	$ret = '';
172		~~- $ret .= wfOpenElement( 'td' );~~
173		~~- $ret .= wfOpenElement( 'div', array(~~
	172	+ $ret .= Xml::openElement( 'td' );
	173	+ $ret .= Xml::openElement( 'div', array(
174	174	'style' => "width:{$wgMiniPreviewThumbnailSize}px;height:{$wgMiniPreviewThumbnailSize}px;overflow:hidden",
175	175	'class' => $divclass )
176	176	);
Index: trunk/extensions/Todo/SpecialTodo.php
—	—	@@ -209,7 +209,7 @@
210	210
211	211	$wgOut->addHTML( "<table>\n<tr>" );
212	212	foreach( $queues as $queue ) {
213		~~- $wgOut->addHTML( wfElement( 'th', null, $queue ) );~~
	213	+ $wgOut->addHTML( Xml::element( 'th', null, $queue ) );
214	214	}
215	215	$wgOut->addHTML( "</tr>\n<tr>\n" );
216	216
—	—	@@ -308,7 +308,7 @@
309	309	global $wgOut, $wgUser, $wgLang;
310	310	$id = $this->id;
311	311
312		~~- $wgOut->addHTML( wfElement( 'div', array(~~
	312	+ $wgOut->addHTML( Xml::element( 'div', array(
313	313	'class' => 'mwTodoTitle',
314	314	'id' => "mwTodoTitle$id",
315	315	'ondblclick' => "todoEditTitle($id,true)" ) ) .
—	—	@@ -319,7 +319,7 @@
320	320
321	321	$wgOut->addHTML( "<div class='mwTodoTimestamp'>" . $wgLang->timeanddate( $this->timestamp ) . "</div>\n" );
322	322
323		~~- $wgOut->addHTML( wfOpenElement( 'div', array(~~
	323	+ $wgOut->addHTML( Xml::openElement( 'div', array(
324	324	'class' => 'mwTodoComment',
325	325	'id' => "mwTodoComment$id",
326	326	'ondblclick' => "todoEditComment($id,true)" ) ) );
—	—	@@ -337,30 +337,30 @@
338	338	$id = $this->id;
339	339	$todo = Title::makeTitle( NS_SPECIAL, 'Todo' );
340	340
341		~~- return wfOpenElement( 'div', array(~~
	341	+ return Xml::openElement( 'div', array(
342	342	'id' => "mwTodo{$capField}Update$id",
343	343	'style' => 'display:none' ) ) .
344		~~- wfOpenElement( 'form', array(~~
	344	+ Xml::openElement( 'form', array(
345	345	'action' => $todo->getLocalUrl(),
346	346	'method' => 'post' ) ) .
347		~~- wfElement( 'input', array(~~
	347	+ Xml::element( 'input', array(
348	348	'name' => 'wpItem', 'type' => 'hidden', 'value' => $this->id ) ) .
349		~~- wfElement( 'input', array(~~
	349	+ Xml::element( 'input', array(
350	350	'name' => 'wpEditToken', 'type' => 'hidden', 'value' => $wgUser->editToken() ) ) .
351		~~- wfElement( 'input', array(~~
	351	+ Xml::element( 'input', array(
352	352	'name' => 'wpUpdateField', 'type' => 'hidden', 'value' => $field ) ) .
353	353	( ( $rows == 1 )
354		~~- ? wfElement( 'input', array(~~
	354	+ ? Xml::element( 'input', array(
355	355	'name' => "wp{$capField}", 'size' => '20', 'value' => $val ) )
356		~~- : wfElement( 'textarea', array(~~
	356	+ : Xml::element( 'textarea', array(
357	357	'name' => "wp{$capField}", 'cols' => '20', 'rows' => '10' ),
358	358	$val . "\n" ) ) .
359	359	"<br />\n" .
360		~~- wfElement( 'input', array(~~
	360	+ Xml::element( 'input', array(
361	361	'type' => 'submit',
362	362	'value' => wfMsg('todo-list-change') ) ) .
363	363	" " .
364		~~- wfElement( 'input', array(~~
	364	+ Xml::element( 'input', array(
365	365	'type' => 'button',
366	366	'value' => wfMsg('todo-list-cancel'),
367	367	'onclick' => "todoEdit{$capField}($id,false)" ) ) .
—	—	@@ -371,15 +371,15 @@
372	372	global $wgUser;
373	373	$id = $this->id;
374	374	$todo = Title::makeTitle( NS_SPECIAL, 'Todo' );
375		~~- return wfOpenElement( 'form', array(~~
	375	+ return Xml::openElement( 'form', array(
376	376	'action' => $todo->getLocalUrl(),
377	377	'method' => 'post',
378	378	'id' => 'mwTodoQueueUpdate' . $this->id ) ) .
379		~~- wfElement( 'input', array(~~
	379	+ Xml::element( 'input', array(
380	380	'name' => 'wpItem', 'type' => 'hidden', 'value' => $this->id ) ) .
381		~~- wfElement( 'input', array(~~
	381	+ Xml::element( 'input', array(
382	382	'name' => 'wpEditToken', 'type' => 'hidden', 'value' => $wgUser->editToken() ) ) .
383		~~- wfElement( 'input', array(~~
	383	+ Xml::element( 'input', array(
384	384	'name' => 'wpUpdateField', 'type' => 'hidden', 'value' => 'queue' ) ) .
385	385	$this->buildMoveSelector( $queues ) .
386	386	"</form>\n";
—	—	@@ -389,11 +389,11 @@
390	390	$out = "<select name='wpQueue' id='mwTodoQueue" . $this->id . "' onchange='todoMoveQueue(" . $this->id . ")'>";
391	391	foreach( $queues as $queue ) {
392	392	if( $queue == $this->queue ) {
393		~~- $out .= wfElement( 'option',~~
	393	+ $out .= Xml::element( 'option',
394	394	array( 'value' => '', 'selected' => 'selected' ),
395	395	wfMsgHtml('todo-move-queue') );
396	396	} else {
397		~~- $out .= wfElement( 'option',~~
	397	+ $out .= Xml::element( 'option',
398	398	array( 'value' => $queue ),
399	399	$queue );
400	400	}
Index: trunk/extensions/AbuseFilter/SpecialAbuseLog.php
—	—	@@ -56,10 +56,10 @@
57	57	$fields = array();
58	58
59	59	// Search conditions
60		~~- $fields['abusefilter-log-search-user'] = wfInput( 'wpSearchUser', 45, $this->mSearchUser );~~
	60	+ $fields['abusefilter-log-search-user'] = Xml::input( 'wpSearchUser', 45, $this->mSearchUser );
61	61	if ($this->canSeeDetails())
62		~~- $fields['abusefilter-log-search-filter'] = wfInput( 'wpSearchFilter', 45, $this->mSearchFilter );~~
63		~~- $fields['abusefilter-log-search-title'] = wfInput( 'wpSearchTitle', 45, $this->mSearchTitle );~~
	62	+ $fields['abusefilter-log-search-filter'] = Xml::input( 'wpSearchFilter', 45, $this->mSearchFilter );
	63	+ $fields['abusefilter-log-search-title'] = Xml::input( 'wpSearchTitle', 45, $this->mSearchTitle );
64	64
65	65	$form = Xml::hidden( 'title', $this->getTitle()->getPrefixedText() );
66	66
—	—	@@ -221,4 +221,4 @@
222	222	function getIndexField() {
223	223	return 'afl_timestamp';
224	224	}
225		-}
\ No newline at end of file
	225	+}
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
—	—	@@ -144,11 +144,11 @@
145	145
146	146	$fields = array();
147	147
148		~~- $fields['ipaddress'] = wfInput( 'address', 45, $this->mAddress );~~
149		~~- $fields['globalblocking-whitelist-reason'] = wfInput( 'wpReason', 45, $this->mReason );~~
	148	+ $fields['ipaddress'] = Xml::input( 'address', 45, $this->mAddress );
	149	+ $fields['globalblocking-whitelist-reason'] = Xml::input( 'wpReason', 45, $this->mReason );
150	150	$fields['globalblocking-whitelist-status'] = Xml::checkLabel( wfMsgExt( 'globalblocking-whitelist-statuslabel', 'parsemag' ), 'wpWhitelistStatus', 'wpWhitelistStatus', $this->mCurrentStatus );
151	151
152		~~- $form .= wfBuildForm( $fields, 'globalblocking-whitelist-submit' );~~
	152	+ $form .= Xml::buildForm( $fields, 'globalblocking-whitelist-submit' );
153	153
154	154	$form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
155	155
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php
—	—	@@ -74,8 +74,8 @@
75	75	}
76	76
77	77	$fields = array();
78		~~- $fields['globalblocking-search-ip'] = wfInput( 'ip', 45, $ip );~~
79		~~- $searchForm .= wfBuildForm( $fields, 'globalblocking-search-submit' );~~
	78	+ $fields['globalblocking-search-ip'] = Xml::input( 'ip', 45, $ip );
	79	+ $searchForm .= Xml::buildForm( $fields, 'globalblocking-search-submit' );
80	80
81	81	$searchForm .= Xml::closeElement( 'form' ) . Xml::closeElement( 'fieldset' );
82	82	$wgOut->addHTML( $searchForm );
Index: trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
—	—	@@ -114,10 +114,10 @@
115	115
116	116	$fields = array();
117	117
118		~~- $fields['ipaddress'] = wfInput( 'address', 45, $this->mUnblockIP );~~
119		~~- $fields['globalblocking-unblock-reason'] = wfInput( 'wpReason', 45, $this->mReason );~~
	118	+ $fields['ipaddress'] = Xml::input( 'address', 45, $this->mUnblockIP );
	119	+ $fields['globalblocking-unblock-reason'] = Xml::input( 'wpReason', 45, $this->mReason );
120	120
121		~~- $form .= wfBuildForm( $fields, 'globalblocking-unblock-submit' );~~
	121	+ $form .= Xml::buildForm( $fields, 'globalblocking-unblock-submit' );
122	122
123	123	$form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
124	124
Index: trunk/extensions/Cite/SpecialCite_body.php
—	—	@@ -56,7 +56,7 @@
57	57	global $wgOut, $wgTitle;
58	58
59	59	$wgOut->addHTML(
60		~~- wfElement( 'form',~~
	60	+ Xml::element( 'form',
61	61	array(
62	62	'id' => 'specialcite',
63	63	'method' => 'get',
—	—	@@ -64,9 +64,9 @@
65	65	),
66	66	null
67	67	) .
68		~~- wfOpenElement( 'label' ) .~~
	68	+ Xml::openElement( 'label' ) .
69	69	wfMsgHtml( 'cite_page' ) . ' ' .
70		~~- wfElement( 'input',~~
	70	+ Xml::element( 'input',
71	71	array(
72	72	'type' => 'text',
73	73	'size' => 30,
—	—	@@ -76,15 +76,15 @@
77	77	''
78	78	) .
79	79	' ' .
80		~~- wfElement( 'input',~~
	80	+ Xml::element( 'input',
81	81	array(
82	82	'type' => 'submit',
83	83	'value' => wfMsgHtml( 'cite_submit' )
84	84	),
85	85	''
86	86	) .
87		~~- wfCloseElement( 'label' ) .~~
88		~~- wfCloseElement( 'form' )~~
	87	+ Xml::closeElement( 'label' ) .
	88	+ Xml::closeElement( 'form' )
89	89	);
90	90	}
91	91
Index: trunk/extensions/BotQuery/query.php
—	—	@@ -2682,7 +2682,7 @@
2683	2683	case 'array':
2684	2684	echo '<struct>';
2685	2685	foreach( $elemValue as $subElemName => &$subElemValue ) {
2686		~~- echo wfOpenElement( 'var', array('name' => $subElemName) );~~
	2686	+ echo Xml::openElement( 'var', array('name' => $subElemName) );
2687	2687	slowWddxPrinter( $subElemValue );
2688	2688	echo '</var>';
2689	2689	}
—	—	@@ -2690,10 +2690,10 @@
2691	2691	break;
2692	2692	case 'integer':
2693	2693	case 'double':
2694		~~- echo wfElement( 'number', null, $elemValue );~~
	2694	+ echo Xml::element( 'number', null, $elemValue );
2695	2695	break;
2696	2696	case 'string':
2697		~~- echo wfElement( 'string', null, $elemValue );~~
	2697	+ echo Xml::element( 'string', null, $elemValue );
2698	2698	break;
2699	2699	default:
2700	2700	wfDebugDieBacktrace( 'Unknown type ' . gettype($elemValue) );
—	—	@@ -2745,14 +2745,14 @@
2746	2746	$subElemContent = $elemValue['*'];
2747	2747	unset( $elemValue['*'] );
2748	2748	if( gettype( $subElemContent ) === 'array' ) {
2749		~~- $printer( $indstr . wfOpenElement( $elemName, $elemValue ));~~
	2749	+ $printer( $indstr . Xml::openElement( $elemName, $elemValue ));
2750	2750	recXmlPrint( $printer, $elemName, $subElemContent, $indent );
2751	2751	$printer( $indstr . "</$elemName>" );
2752	2752	} else {
2753		~~- $printer( $indstr . wfElement( $elemName, $elemValue, $subElemContent ));~~
	2753	+ $printer( $indstr . Xml::element( $elemName, $elemValue, $subElemContent ));
2754	2754	}
2755	2755	} else {
2756		~~- $printer( $indstr . wfOpenElement( $elemName, null ));~~
	2756	+ $printer( $indstr . Xml::openElement( $elemName, null ));
2757	2757	if( array_key_exists('_element', $elemValue) ) {
2758	2758	$subElemName = $elemValue['_element'];
2759	2759	foreach( $elemValue as $subElemId => &$subElemValue ) {
—	—	@@ -2772,7 +2772,7 @@
2773	2773	// ignore
2774	2774	break;
2775	2775	default:
2776		~~- $printer( $indstr . wfElement( $elemName, null, $elemValue ));~~
	2776	+ $printer( $indstr . Xml::element( $elemName, null, $elemValue ));
2777	2777	break;
2778	2778	}
2779	2779	}
Index: trunk/extensions/Makebot/Makebot.class.php
—	—	@@ -34,7 +34,7 @@
35	35	$wgOut->addHTML( $this->makeSearchForm() );
36	36
37	37	if( $this->target != '' ) {
38		~~- //$wgOut->addHTML( wfElement( 'p', NULL, NULL ) );~~
	38	+ //$wgOut->addHTML( Xml::element( 'p', NULL, NULL ) );
39	39	$user = User::newFromName( $this->target );
40	40	if( is_object( $user ) && !is_null( $user ) ) {
41	41	global $wgVersion;
—	—	@@ -92,11 +92,11 @@
93	93	*/
94	94	function makeSearchForm() {
95	95	$thisTitle = Title::makeTitle( NS_SPECIAL, $this->getName() );
96		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );~~
97		~~- $form .= wfElement( 'label', array( 'for' => 'username' ), wfMsg( 'makebot-username' ) ) . ' ';~~
98		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';~~
99		~~- $form .= wfElement( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'makebot-search' ) ) );~~
100		~~- $form .= wfCloseElement( 'form' );~~
	96	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
	97	+ $form .= Xml::element( 'label', array( 'for' => 'username' ), wfMsg( 'makebot-username' ) ) . ' ';
	98	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'username', 'id' => 'username', 'value' => $this->target ) ) . ' ';
	99	+ $form .= Xml::element( 'input', array( 'type' => 'submit', 'name' => 'dosearch', 'value' => wfMsg( 'makebot-search' ) ) );
	100	+ $form .= Xml::closeElement( 'form' );
101	101	return $form;
102	102	}
103	103
—	—	@@ -118,33 +118,33 @@
119	119	}
120	120
121	121	# Start the table
122		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );~~
123		~~- $form .= wfOpenElement( 'table' ) . wfOpenElement( 'tr' );~~
	122	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
	123	+ $form .= Xml::openElement( 'table' ) . Xml::openElement( 'tr' );
124	124	# Grant/revoke buttons
125		~~- $form .= wfElement( 'td', array( 'align' => 'right' ), wfMsg( 'makebot-change' ) );~~
126		~~- $form .= wfOpenElement( 'td' );~~
	125	+ $form .= Xml::element( 'td', array( 'align' => 'right' ), wfMsg( 'makebot-change' ) );
	126	+ $form .= Xml::openElement( 'td' );
127	127	foreach( array( 'grant', 'revoke' ) as $button ) {
128	128	$attribs = array( 'type' => 'submit', 'name' => $button, 'value' => wfMsg( 'makebot-' . $button ) );
129	129	if( !$$button )
130	130	$attribs['disabled'] = 'disabled';
131		~~- $form .= wfElement( 'input', $attribs );~~
	131	+ $form .= Xml::element( 'input', $attribs );
132	132	}
133		~~- $form .= wfCloseElement( 'td' ) . wfCloseElement( 'tr' );~~
	133	+ $form .= Xml::closeElement( 'td' ) . Xml::closeElement( 'tr' );
134	134	# Comment field
135		~~- $form .= wfOpenElement( 'tr' );~~
136		~~- $form .= wfOpenElement( 'td', array( 'align' => 'right' ) );~~
137		~~- $form .= wfElement( 'label', array( 'for' => 'comment' ), wfMsg( 'makebot-comment' ) );~~
138		~~- $form .= wfCloseElement( 'td' );~~
139		~~- $form .= wfOpenElement( 'td' );~~
140		~~- $form .= wfElement( 'input', array( 'type' => 'text', 'name' => 'comment', 'id' => 'comment', 'size' => 45, 'maxlength' => 255 ) );~~
141		~~- $form .= wfCloseElement( 'td' ) . wfCloseElement( 'tr' );~~
	135	+ $form .= Xml::openElement( 'tr' );
	136	+ $form .= Xml::openElement( 'td', array( 'align' => 'right' ) );
	137	+ $form .= Xml::element( 'label', array( 'for' => 'comment' ), wfMsg( 'makebot-comment' ) );
	138	+ $form .= Xml::closeElement( 'td' );
	139	+ $form .= Xml::openElement( 'td' );
	140	+ $form .= Xml::element( 'input', array( 'type' => 'text', 'name' => 'comment', 'id' => 'comment', 'size' => 45, 'maxlength' => 255 ) );
	141	+ $form .= Xml::closeElement( 'td' ) . Xml::closeElement( 'tr' );
142	142	# End table
143		~~- $form .= wfCloseElement( 'table' );~~
	143	+ $form .= Xml::closeElement( 'table' );
144	144	# Username
145		~~- $form .= wfElement( 'input', array( 'type' => 'hidden', 'name' => 'username', 'value' => $this->target ) );~~
	145	+ $form .= Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'username', 'value' => $this->target ) );
146	146	# Edit token
147		~~- $form .= wfElement( 'input', array( 'type' => 'hidden', 'name' => 'token', 'value' => $wgUser->editToken( 'makebot' ) ) );~~
148		~~- $form .= wfCloseElement( 'form' );~~
	147	+ $form .= Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'token', 'value' => $wgUser->editToken( 'makebot' ) ) );
	148	+ $form .= Xml::closeElement( 'form' );
149	149	return $form;
150	150	}
151	151
—	—	@@ -167,7 +167,7 @@
168	168	function showLogEntries( &$user, $logtype = 'makebot' ) {
169	169	global $wgOut;
170	170	$title = $user->getUserPage();
171		~~- $wgOut->addHTML( wfElement( 'h2', NULL, htmlspecialchars( LogPage::logName( $logtype ) ) ) );~~
	171	+ $wgOut->addHTML( Xml::element( 'h2', NULL, htmlspecialchars( LogPage::logName( $logtype ) ) ) );
172	172	$logViewer = new LogViewer( new LogReader( new FauxRequest( array( 'page' => $title->getPrefixedText(), 'type' => $logtype ) ) ) );
173	173	$logViewer->showList( $wgOut );
174	174	}
Index: trunk/extensions/TalkHere/TalkHereArticle.php
—	—	@@ -241,7 +241,7 @@
242	242	'accesskey' => wfMsg('accesskey-save'),
243	243	'title' => wfMsg( 'tooltip-save' ).' ['.wfMsg( 'accesskey-save' ).']',
244	244	);
245		~~- $wgOut->addHTML( wfElement('input', $temp, '') );~~
	245	+ $wgOut->addHTML( Xml::element('input', $temp, '') );
246	246
247	247	$temp = array(
248	248	'id' => 'wpPreview',
—	—	@@ -252,7 +252,7 @@
253	253	'accesskey' => wfMsg('accesskey-preview'),
254	254	'title' => wfMsg( 'tooltip-preview' ).' ['.wfMsg( 'accesskey-preview' ).']',
255	255	);
256		~~- $wgOut->addHTML( wfElement('input', $temp, '') );~~
	256	+ $wgOut->addHTML( Xml::element('input', $temp, '') );
257	257
258	258	$edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' ));
259	259	$edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
Index: trunk/extensions/Poem/Poem.php
—	—	@@ -92,7 +92,7 @@
93	93	$attribs['class'] = 'poem';
94	94	}
95	95
96		~~- return wfOpenElement( 'div', $attribs ) .~~
	96	+ return Xml::openElement( 'div', $attribs ) .
97	97	$nl .
98	98	trim( $text ) .
99	99	"$nl</div>";
Index: trunk/extensions/FindSpam/FindSpam_body.php
—	—	@@ -28,10 +28,10 @@
29	29
30	30	# Show form
31	31	$self = Title::makeTitle( NS_SPECIAL, 'FindSpam' );
32		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );~~
	32	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
33	33	$form .= '<table><tr><td align="right">' . wfMsgHtml( 'findspam-ip' ) . '</td>';
34		~~- $form .= '<td>' . wfInput( 'ip', 50, $ip ) . '</td></tr>';~~
35		~~- $form .= '<tr><td></td><td>' . wfSubmitButton( wfMsg( 'findspam-ok' ) ) . '</td></tr></table></form>';~~
	34	+ $form .= '<td>' . Xml::input( 'ip', 50, $ip ) . '</td></tr>';
	35	+ $form .= '<tr><td></td><td>' . Xml::submitButton( wfMsg( 'findspam-ok' ) ) . '</td></tr></table></form>';
36	36	$wgOut->addHTML( $form );
37	37
38	38	if ( $ip ) {
Index: trunk/extensions/PurgeCache/PurgeCache_body.php
—	—	@@ -32,9 +32,9 @@
33	33
34	34	function makeForm() {
35	35	$self = $this->getTitle();
36		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );~~
37		~~- $form .= wfElement( 'input', array( 'type' => 'submit', 'name' => 'purge', 'value' => wfMsg('purgecache-button') ) );~~
38		~~- $form .= wfCloseElement( 'form' );~~
	36	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
	37	+ $form .= Xml::element( 'input', array( 'type' => 'submit', 'name' => 'purge', 'value' => wfMsg('purgecache-button') ) );
	38	+ $form .= Xml::closeElement( 'form' );
39	39	return $form;
40	40	}
41	41	}
Index: trunk/extensions/SisterSites/SisterSites.php
—	—	@@ -32,7 +32,7 @@
33	33
34	34	function wfSisterList( $sites ) {
35	35	foreach( $sites as $site ) {
36		~~- $bits[] = wfElement( 'a',~~
	36	+ $bits[] = Xml::element( 'a',
37	37	array(
38	38	'href' => $site->getUrl(),
39	39	'class' => 'extiw',
Index: trunk/extensions/NewestPages/NewestPages.page.php
—	—	@@ -156,12 +156,12 @@
157	157
158	158	function makeNamespaceForm() {
159	159	$self = Title::makeTitle( NS_SPECIAL, $this->getName() );
160		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );~~
161		~~- $form .= wfLabel( wfMsg( 'newestpages-namespace' ), 'namespace' ) . ' ';~~
162		~~- $form .= htmlNamespaceSelector( $this->namespace, 'all' );~~
163		~~- $form .= wfHidden( 'limit', $this->limit );~~
164		~~- $form .= wfHidden( 'redirects', $this->redirects );~~
165		~~- $form .= wfSubmitButton( wfMsg( 'newestpages-submit' ) ) . '</form>';~~
	160	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
	161	+ $form .= Xml::label( wfMsg( 'newestpages-namespace' ), 'namespace' ) . ' ';
	162	+ $form .= Xml::namespaceSelector( $this->namespace, 'all' );
	163	+ $form .= Xml::hidden( 'limit', $this->limit );
	164	+ $form .= Xml::hidden( 'redirects', $this->redirects );
	165	+ $form .= Xml::submitButton( wfMsg( 'newestpages-submit' ) ) . '</form>';
166	166	return $form;
167	167	}
168	168	}
Index: trunk/extensions/Player/SpecialPlayer.php
—	—	@@ -147,8 +147,8 @@
148	148
149	149	if ( $exif ) {
150	150	global $wgStylePath, $wgStyleVersion;
151		~~- $expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) );~~
152		~~- $collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) );~~
	151	+ $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
	152	+ $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
153	153	$wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" );
154	154	$wgOut->addWikiText( $this->makeMetadataTable( $exif ) );
155	155	$wgOut->addHTML(

Follow-up revisions

Revision	Commit summary	Author	Date
r44978	At least disable old xml function loading per r44839. An easy ~9-10ms.	aaron	21:42, 23 December 2008

Status & tagging log

20:30, 23 December 2008 Brion VIBBER (talk | contribs) changed the status of r44839 [removed: new added: deferred]