r44588 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r44587‎ \| r44588 \| r44589 >
Date:	19:14, 14 December 2008
Author:	demon
Status:	ok
Tags:
Comment:	War on wfElement() and friends. Call the Xml members directly, rather than using old wrappers.
Modified paths:	/trunk/phase3/includes/Export.php (modified) (history) /trunk/phase3/includes/ImagePage.php (modified) (history) /trunk/phase3/includes/Licenses.php (modified) (history) /trunk/phase3/includes/Linker.php (modified) (history) /trunk/phase3/includes/Skin.php (modified) (history) /trunk/phase3/includes/SkinTemplate.php (modified) (history) /trunk/phase3/includes/api/ApiFormatWddx.php (modified) (history) /trunk/phase3/includes/api/ApiFormatXml.php (modified) (history) /trunk/phase3/includes/parser/Parser.php (modified) (history) /trunk/phase3/includes/specials/SpecialConfirmemail.php (modified) (history) /trunk/phase3/includes/specials/SpecialMergeHistory.php (modified) (history) /trunk/phase3/includes/specials/SpecialPreferences.php (modified) (history) /trunk/phase3/includes/specials/SpecialRecentchanges.php (modified) (history) /trunk/phase3/includes/specials/SpecialUndelete.php (modified) (history) /trunk/phase3/maintenance/dumpTextPass.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/dumpTextPass.php
—	—	@@ -487,7 +487,7 @@
488	488
489	489	function clearOpenElement( $style ) {
490	490	if( $this->openElement ) {
491		~~- $this->buffer .= wfElement( $this->openElement[0], $this->openElement[1], $style );~~
	491	+ $this->buffer .= Xml::element( $this->openElement[0], $this->openElement[1], $style );
492	492	$this->openElement = false;
493	493	}
494	494	}
Index: trunk/phase3/includes/Licenses.php
—	—	@@ -121,7 +121,7 @@
122	122
123	123	function outputOption( $val, $attribs = null, $depth ) {
124	124	$val = str_repeat( /* &nbsp / "\xc2\xa0", $depth 2 ) . $val;
125		~~- return str_repeat( "\t", $depth ) . wfElement( 'option', $attribs, $val ) . "\n";~~
	125	+ return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
126	126	}
127	127
128	128	function msg( $str ) {
Index: trunk/phase3/includes/parser/Parser.php
—	—	@@ -4101,7 +4101,7 @@
4102	4102	$content = StringUtils::delimiterReplace( '<nowiki>', '</nowiki>', '$1', $text, 'i' );
4103	4103
4104	4104	$attribs = Sanitizer::validateTagAttributes( $attribs, 'pre' );
4105		~~- return wfOpenElement( 'pre', $attribs ) .~~
	4105	+ return Xml::openElement( 'pre', $attribs ) .
4106	4106	Xml::escapeTagsOnly( $content ) .
4107	4107	'</pre>';
4108	4108	}
Index: trunk/phase3/includes/ImagePage.php
—	—	@@ -131,8 +131,8 @@
132	132
133	133	if( $showmeta ) {
134	134	global $wgStylePath, $wgStyleVersion;
135		~~- $expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) );~~
136		~~- $collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) );~~
	135	+ $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
	136	+ $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
137	137	$wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" );
138	138	$wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
139	139	$wgOut->addScriptFile( 'metadata.js' );
Index: trunk/phase3/includes/Linker.php
—	—	@@ -1421,8 +1421,8 @@
1422	1422	. "</ul>\n</td></tr></table>"
1423	1423	. '<script type="' . $wgJsMimeType . '">'
1424	1424	. ' if (window.showTocToggle) {'
1425		~~- . ' var tocShowText = "' . wfEscapeJsString( wfMsg('showtoc') ) . '";'~~
1426		~~- . ' var tocHideText = "' . wfEscapeJsString( wfMsg('hidetoc') ) . '";'~~
	1425	+ . ' var tocShowText = "' . Xml::escapeJsString( wfMsg('showtoc') ) . '";'
	1426	+ . ' var tocHideText = "' . Xml::escapeJsString( wfMsg('hidetoc') ) . '";'
1427	1427	. ' showTocToggle();'
1428	1428	. ' } '
1429	1429	. "</script>\n";
Index: trunk/phase3/includes/Export.php
—	—	@@ -352,7 +352,7 @@
353	353	function openStream() {
354	354	global $wgContLanguageCode;
355	355	$ver = $this->schemaVersion();
356		~~- return wfElement( 'mediawiki', array(~~
	356	+ return Xml::element( 'mediawiki', array(
357	357	'xmlns' => "http://www.mediawiki.org/xml/export-$ver/",
358	358	'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
359	359	'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
—	—	@@ -378,30 +378,30 @@
379	379
380	380	function sitename() {
381	381	global $wgSitename;
382		~~- return wfElement( 'sitename', array(), $wgSitename );~~
	382	+ return Xml::element( 'sitename', array(), $wgSitename );
383	383	}
384	384
385	385	function generator() {
386	386	global $wgVersion;
387		~~- return wfElement( 'generator', array(), "MediaWiki $wgVersion" );~~
	387	+ return Xml::element( 'generator', array(), "MediaWiki $wgVersion" );
388	388	}
389	389
390	390	function homelink() {
391		~~- return wfElement( 'base', array(), Title::newMainPage()->getFullUrl() );~~
	391	+ return Xml::element( 'base', array(), Title::newMainPage()->getFullUrl() );
392	392	}
393	393
394	394	function caseSetting() {
395	395	global $wgCapitalLinks;
396	396	// "case-insensitive" option is reserved for future
397	397	$sensitivity = $wgCapitalLinks ? 'first-letter' : 'case-sensitive';
398		~~- return wfElement( 'case', array(), $sensitivity );~~
	398	+ return Xml::element( 'case', array(), $sensitivity );
399	399	}
400	400
401	401	function namespaces() {
402	402	global $wgContLang;
403	403	$spaces = " <namespaces>\n";
404	404	foreach( $wgContLang->getFormattedNamespaces() as $ns => $title ) {
405		~~- $spaces .= ' ' . wfElement( 'namespace', array( 'key' => $ns ), $title ) . "\n";~~
	405	+ $spaces .= ' ' . Xml::element( 'namespace', array( 'key' => $ns ), $title ) . "\n";
406	406	}
407	407	$spaces .= " </namespaces>";
408	408	return $spaces;
—	—	@@ -427,10 +427,10 @@
428	428	function openPage( $row ) {
429	429	$out = " <page>\n";
430	430	$title = Title::makeTitle( $row->page_namespace, $row->page_title );
431		~~- $out .= ' ' . wfElementClean( 'title', array(), $title->getPrefixedText() ) . "\n";~~
432		~~- $out .= ' ' . wfElement( 'id', array(), strval( $row->page_id ) ) . "\n";~~
	431	+ $out .= ' ' . Xml::elementClean( 'title', array(), $title->getPrefixedText() ) . "\n";
	432	+ $out .= ' ' . Xml::element( 'id', array(), strval( $row->page_id ) ) . "\n";
433	433	if( '' != $row->page_restrictions ) {
434		~~- $out .= ' ' . wfElement( 'restrictions', array(),~~
	434	+ $out .= ' ' . Xml::element( 'restrictions', array(),
435	435	strval( $row->page_restrictions ) ) . "\n";
436	436	}
437	437	return $out;
—	—	@@ -458,12 +458,12 @@
459	459	wfProfileIn( $fname );
460	460
461	461	$out = " <revision>\n";
462		~~- $out .= " " . wfElement( 'id', null, strval( $row->rev_id ) ) . "\n";~~
	462	+ $out .= " " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n";
463	463
464	464	$out .= $this->writeTimestamp( $row->rev_timestamp );
465	465
466	466	if( $row->rev_deleted & Revision::DELETED_USER ) {
467		~~- $out .= " " . wfElement( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";~~
	467	+ $out .= " " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
468	468	} else {
469	469	$out .= $this->writeContributor( $row->rev_user, $row->rev_user_text );
470	470	}
—	—	@@ -472,22 +472,22 @@
473	473	$out .= " <minor/>\n";
474	474	}
475	475	if( $row->rev_deleted & Revision::DELETED_COMMENT ) {
476		~~- $out .= " " . wfElement( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";~~
	476	+ $out .= " " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
477	477	} elseif( $row->rev_comment != '' ) {
478		~~- $out .= " " . wfElementClean( 'comment', null, strval( $row->rev_comment ) ) . "\n";~~
	478	+ $out .= " " . Xml::elementClean( 'comment', null, strval( $row->rev_comment ) ) . "\n";
479	479	}
480	480
481	481	if( $row->rev_deleted & Revision::DELETED_TEXT ) {
482		~~- $out .= " " . wfElement( 'text', array( 'deleted' => 'deleted' ) ) . "\n";~~
	482	+ $out .= " " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
483	483	} elseif( isset( $row->old_text ) ) {
484	484	// Raw text from the database may have invalid chars
485	485	$text = strval( Revision::getRevisionText( $row ) );
486		~~- $out .= " " . wfElementClean( 'text',~~
	486	+ $out .= " " . Xml::elementClean( 'text',
487	487	array( 'xml:space' => 'preserve' ),
488	488	strval( $text ) ) . "\n";
489	489	} else {
490	490	// Stub output
491		~~- $out .= " " . wfElement( 'text',~~
	491	+ $out .= " " . Xml::element( 'text',
492	492	array( 'id' => $row->rev_text_id ),
493	493	"" ) . "\n";
494	494	}
—	—	@@ -511,31 +511,31 @@
512	512	wfProfileIn( $fname );
513	513
514	514	$out = " <logitem>\n";
515		~~- $out .= " " . wfElement( 'id', null, strval( $row->log_id ) ) . "\n";~~
	515	+ $out .= " " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n";
516	516
517	517	$out .= $this->writeTimestamp( $row->log_timestamp );
518	518
519	519	if( $row->log_deleted & LogPage::DELETED_USER ) {
520		~~- $out .= " " . wfElement( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";~~
	520	+ $out .= " " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
521	521	} else {
522	522	$out .= $this->writeContributor( $row->log_user, $row->user_name );
523	523	}
524	524
525	525	if( $row->log_deleted & LogPage::DELETED_COMMENT ) {
526		~~- $out .= " " . wfElement( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";~~
	526	+ $out .= " " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
527	527	} elseif( $row->log_comment != '' ) {
528		~~- $out .= " " . wfElementClean( 'comment', null, strval( $row->log_comment ) ) . "\n";~~
	528	+ $out .= " " . Xml::elementClean( 'comment', null, strval( $row->log_comment ) ) . "\n";
529	529	}
530	530
531		~~- $out .= " " . wfElement( 'type', null, strval( $row->log_type ) ) . "\n";~~
532		~~- $out .= " " . wfElement( 'action', null, strval( $row->log_action ) ) . "\n";~~
	531	+ $out .= " " . Xml::element( 'type', null, strval( $row->log_type ) ) . "\n";
	532	+ $out .= " " . Xml::element( 'action', null, strval( $row->log_action ) ) . "\n";
533	533
534	534	if( $row->log_deleted & LogPage::DELETED_ACTION ) {
535		~~- $out .= " " . wfElement( 'text', array( 'deleted' => 'deleted' ) ) . "\n";~~
	535	+ $out .= " " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
536	536	} else {
537	537	$title = Title::makeTitle( $row->log_namespace, $row->log_title );
538		~~- $out .= " " . wfElementClean( 'logtitle', null, $title->getPrefixedText() ) . "\n";~~
539		~~- $out .= " " . wfElementClean( 'params',~~
	538	+ $out .= " " . Xml::elementClean( 'logtitle', null, $title->getPrefixedText() ) . "\n";
	539	+ $out .= " " . Xml::elementClean( 'params',
540	540	array( 'xml:space' => 'preserve' ),
541	541	strval( $row->log_params ) ) . "\n";
542	542	}
—	—	@@ -548,16 +548,16 @@
549	549
550	550	function writeTimestamp( $timestamp ) {
551	551	$ts = wfTimestamp( TS_ISO_8601, $timestamp );
552		~~- return " " . wfElement( 'timestamp', null, $ts ) . "\n";~~
	552	+ return " " . Xml::element( 'timestamp', null, $ts ) . "\n";
553	553	}
554	554
555	555	function writeContributor( $id, $text ) {
556	556	$out = " <contributor>\n";
557	557	if( $id ) {
558		~~- $out .= " " . wfElementClean( 'username', null, strval( $text ) ) . "\n";~~
559		~~- $out .= " " . wfElement( 'id', null, strval( $id ) ) . "\n";~~
	558	+ $out .= " " . Xml::elementClean( 'username', null, strval( $text ) ) . "\n";
	559	+ $out .= " " . Xml::element( 'id', null, strval( $id ) ) . "\n";
560	560	} else {
561		~~- $out .= " " . wfElementClean( 'ip', null, strval( $text ) ) . "\n";~~
	561	+ $out .= " " . Xml::elementClean( 'ip', null, strval( $text ) ) . "\n";
562	562	}
563	563	$out .= " </contributor>\n";
564	564	return $out;
—	—	@@ -585,10 +585,10 @@
586	586	return " <upload>\n" .
587	587	$this->writeTimestamp( $file->getTimestamp() ) .
588	588	$this->writeContributor( $file->getUser( 'id' ), $file->getUser( 'text' ) ) .
589		~~- " " . wfElementClean( 'comment', null, $file->getDescription() ) . "\n" .~~
590		~~- " " . wfElement( 'filename', null, $file->getName() ) . "\n" .~~
591		~~- " " . wfElement( 'src', null, $file->getFullUrl() ) . "\n" .~~
592		~~- " " . wfElement( 'size', null, $file->getSize() ) . "\n" .~~
	589	+ " " . Xml::elementClean( 'comment', null, $file->getDescription() ) . "\n" .
	590	+ " " . Xml::element( 'filename', null, $file->getName() ) . "\n" .
	591	+ " " . Xml::element( 'src', null, $file->getFullUrl() ) . "\n" .
	592	+ " " . Xml::element( 'size', null, $file->getSize() ) . "\n" .
593	593	" </upload>\n";
594	594	}
595	595
Index: trunk/phase3/includes/api/ApiFormatWddx.php
—	—	@@ -73,7 +73,7 @@
74	74	$cnt = count($elemValue);
75	75	if($cnt == 0 \|\| array_keys($elemValue) === range(0, $cnt - 1)) {
76	76	// Regular array
77		~~- $this->printText($indstr . wfElement('array', array(~~
	77	+ $this->printText($indstr . Xml::element('array', array(
78	78	'length' => $cnt
79	79	), null) . $nl);
80	80	foreach($elemValue as $subElemValue)
—	—	@@ -83,7 +83,7 @@
84	84	// Associative array (<struct>)
85	85	$this->printText("$indstr<struct>$nl");
86	86	foreach($elemValue as $subElemName => $subElemValue) {
87		~~- $this->printText($indstr2 . wfElement('var', array(~~
	87	+ $this->printText($indstr2 . Xml::element('var', array(
88	88	'name' => $subElemName
89	89	), null) . $nl);
90	90	$this->slowWddxPrinter($subElemValue, $indent + 4);
—	—	@@ -94,10 +94,10 @@
95	95	break;
96	96	case 'integer' :
97	97	case 'double' :
98		~~- $this->printText($indstr . wfElement('number', null, $elemValue) . $nl);~~
	98	+ $this->printText($indstr . Xml::element('number', null, $elemValue) . $nl);
99	99	break;
100	100	case 'string' :
101		~~- $this->printText($indstr . wfElement('string', null, $elemValue) . $nl);~~
	101	+ $this->printText($indstr . Xml::element('string', null, $elemValue) . $nl);
102	102	break;
103	103	default :
104	104	ApiBase :: dieDebug(__METHOD__, 'Unknown type ' . gettype($elemValue));
Index: trunk/phase3/includes/api/ApiFormatXml.php
—	—	@@ -130,11 +130,11 @@
131	131	ApiBase :: dieDebug(__METHOD__, "($elemName, ...) has content and subelements");
132	132
133	133	if (!is_null($subElemContent)) {
134		~~- $this->printText($indstr . wfElement($elemName, $elemValue, $subElemContent));~~
	134	+ $this->printText($indstr . Xml::element($elemName, $elemValue, $subElemContent));
135	135	} elseif (!count($indElements) && !count($subElements)) {
136		~~- $this->printText($indstr . wfElement($elemName, $elemValue));~~
	136	+ $this->printText($indstr . Xml::element($elemName, $elemValue));
137	137	} else {
138		~~- $this->printText($indstr . wfElement($elemName, $elemValue, null));~~
	138	+ $this->printText($indstr . Xml::element($elemName, $elemValue, null));
139	139
140	140	foreach ($subElements as $subElemId => & $subElemValue)
141	141	$this->recXmlPrint($subElemId, $subElemValue, $indent);
—	—	@@ -142,14 +142,14 @@
143	143	foreach ($indElements as $subElemId => & $subElemValue)
144	144	$this->recXmlPrint($subElemIndName, $subElemValue, $indent);
145	145
146		~~- $this->printText($indstr . wfCloseElement($elemName));~~
	146	+ $this->printText($indstr . Xml::closeElement($elemName));
147	147	}
148	148	break;
149	149	case 'object' :
150	150	// ignore
151	151	break;
152	152	default :
153		~~- $this->printText($indstr . wfElement($elemName, null, $elemValue));~~
	153	+ $this->printText($indstr . Xml::element($elemName, null, $elemValue));
154	154	break;
155	155	}
156	156	}
Index: trunk/phase3/includes/SkinTemplate.php
—	—	@@ -311,7 +311,7 @@
312	312	$sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
313	313	$msgs = array();
314	314	foreach ($newtalks as $newtalk) {
315		~~- $msgs[] = wfElement("a",~~
	315	+ $msgs[] = Xml::element("a",
316	316	array('href' => $newtalk["link"]), $newtalk["wiki"]);
317	317	}
318	318	$parts = implode($sep, $msgs);
—	—	@@ -438,7 +438,7 @@
439	439	// XXX: attach this from javascript, same with section editing
440	440	if($this->iseditable && $wgUser->getOption("editondblclick") )
441	441	{
442		~~- $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );~~
	442	+ $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
443	443	$tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
444	444	} else {
445	445	$tpl->set('body_ondblclick', false);
Index: trunk/phase3/includes/specials/SpecialUndelete.php
—	—	@@ -791,37 +791,37 @@
792	792	}
793	793
794	794	$wgOut->addHTML(
795		~~- wfElement( 'textarea', array(~~
	795	+ Xml::element( 'textarea', array(
796	796	'readonly' => 'readonly',
797	797	'cols' => intval( $wgUser->getOption( 'cols' ) ),
798	798	'rows' => intval( $wgUser->getOption( 'rows' ) ) ),
799	799	$rev->getText( Revision::FOR_THIS_USER ) . "\n" ) .
800		~~- wfOpenElement( 'div' ) .~~
801		~~- wfOpenElement( 'form', array(~~
	800	+ Xml::openElement( 'div' ) .
	801	+ Xml::openElement( 'form', array(
802	802	'method' => 'post',
803	803	'action' => $self->getLocalURL( "action=submit" ) ) ) .
804		~~- wfElement( 'input', array(~~
	804	+ Xml::element( 'input', array(
805	805	'type' => 'hidden',
806	806	'name' => 'target',
807	807	'value' => $this->mTargetObj->getPrefixedDbKey() ) ) .
808		~~- wfElement( 'input', array(~~
	808	+ Xml::element( 'input', array(
809	809	'type' => 'hidden',
810	810	'name' => 'timestamp',
811	811	'value' => $timestamp ) ) .
812		~~- wfElement( 'input', array(~~
	812	+ Xml::element( 'input', array(
813	813	'type' => 'hidden',
814	814	'name' => 'wpEditToken',
815	815	'value' => $wgUser->editToken() ) ) .
816		~~- wfElement( 'input', array(~~
	816	+ Xml::element( 'input', array(
817	817	'type' => 'submit',
818	818	'name' => 'preview',
819	819	'value' => wfMsg( 'showpreview' ) ) ) .
820		~~- wfElement( 'input', array(~~
	820	+ Xml::element( 'input', array(
821	821	'name' => 'diff',
822	822	'type' => 'submit',
823	823	'value' => wfMsg( 'showdiff' ) ) ) .
824		~~- wfCloseElement( 'form' ) .~~
825		~~- wfCloseElement( 'div' ) );~~
	824	+ Xml::closeElement( 'form' ) .
	825	+ Xml::closeElement( 'div' ) );
826	826	}
827	827
828	828	/**
Index: trunk/phase3/includes/specials/SpecialPreferences.php
—	—	@@ -936,9 +936,9 @@
937	937	global $wgLivePreview;
938	938	$wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textboxsize' ) . '</legend>
939	939	<div>' .
940		~~- wfInputLabel( wfMsg( 'rows' ), 'wpRows', 'wpRows', 3, $this->mRows ) .~~
	940	+ Xml::inputLabel( wfMsg( 'rows' ), 'wpRows', 'wpRows', 3, $this->mRows ) .
941	941	' ' .
942		~~- wfInputLabel( wfMsg( 'columns' ), 'wpCols', 'wpCols', 3, $this->mCols ) .~~
	942	+ Xml::inputLabel( wfMsg( 'columns' ), 'wpCols', 'wpCols', 3, $this->mCols ) .
943	943	"</div>" .
944	944	$this->getToggles( array(
945	945	'editsection',
Index: trunk/phase3/includes/specials/SpecialRecentchanges.php
—	—	@@ -485,7 +485,7 @@
486	486	* @return string
487	487	*/
488	488	protected function namespaceFilterForm( FormOptions $opts ) {
489		~~- $nsSelect = HTMLnamespaceselector( $opts['namespace'], '' );~~
	489	+ $nsSelect = Xml::namespaceSelector( $opts['namespace'], '' );
490	490	$nsLabel = Xml::label( wfMsg('namespace'), 'namespace' );
491	491	$invert = Xml::checkLabel( wfMsg('invert'), 'invert', 'nsinvert', $opts['invert'] );
492	492	return array( $nsLabel, "$nsSelect $invert" );
Index: trunk/phase3/includes/specials/SpecialConfirmemail.php
—	—	@@ -71,10 +71,10 @@
72	72	}
73	73	$wgOut->addWikiMsg( 'confirmemail_text' );
74	74	$self = SpecialPage::getTitleFor( 'Confirmemail' );
75		~~- $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );~~
76		~~- $form .= wfHidden( 'token', $wgUser->editToken() );~~
77		~~- $form .= wfSubmitButton( wfMsgHtml( 'confirmemail_send' ) );~~
78		~~- $form .= wfCloseElement( 'form' );~~
	75	+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
	76	+ $form .= Xml::hidden( 'token', $wgUser->editToken() );
	77	+ $form .= Xml::submitButton( wfMsgHtml( 'confirmemail_send' ) );
	78	+ $form .= Xml::closeElement( 'form' );
79	79	$wgOut->addHTML( $form );
80	80	}
81	81	}
Index: trunk/phase3/includes/specials/SpecialMergeHistory.php
—	—	@@ -231,7 +231,7 @@
232	232	$last = $this->message['last'];
233	233
234	234	$ts = wfTimestamp( TS_MW, $row->rev_timestamp );
235		~~- $checkBox = wfRadio( "mergepoint", $ts, false );~~
	235	+ $checkBox = Xml::radio( "mergepoint", $ts, false );
236	236
237	237	$pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(),
238	238	htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getId() );
Index: trunk/phase3/includes/Skin.php
—	—	@@ -646,7 +646,7 @@
647	647	if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
648	648	$wgTitle->quickUserCan( 'edit' ) ) {
649	649	$s = $wgTitle->getFullURL( $this->editUrlOptions() );
650		~~- $s = 'document.location = "' .wfEscapeJSString( $s ) .'";';~~
	650	+ $s = 'document.location = "' .Xml::escapeJsString( $s ) .'";';
651	651	$a += array ('ondblclick' => $s);
652	652
653	653	}

Status & tagging log

19:13, 15 December 2008 Aaron Schulz (talk | contribs) changed the status of r44588 [removed: new added: ok]