r86240 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r86239‎ \| r86240 \| r86241 >
Date:	21:43, 16 April 2011
Author:	happy-melon
Status:	ok
Tags:
Comment:	More deprecated calls to Skin static methods, update to use Linker methods instead.
Modified paths:	/trunk/phase3/skins/CologneBlue.php (modified) (history) /trunk/phase3/skins/MonoBook.php (modified) (history) /trunk/phase3/skins/Nostalgia.php (modified) (history) /trunk/phase3/skins/Standard.php (modified) (history) /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/CologneBlue.php
—	—	@@ -111,7 +111,7 @@
112	112
113	113	$s .= $this->bottomLinks();
114	114	$s .= $wgLang->pipeList( array(
115		~~- "\n<br />" . $this->getSkin()->link(~~
	115	+ "\n<br />" . Linker::link(
116	116	Title::newMainPage(),
117	117	null,
118	118	array(),
—	—	@@ -150,19 +150,19 @@
151	151
152	152	$s = array(
153	153	$this->getSkin()->mainPageLink(),
154		~~- $this->getSkin()->linkKnown(~~
	154	+ Linker::linkKnown(
155	155	Title::newFromText( wfMsgForContent( 'aboutpage' ) ),
156	156	wfMsg( 'about' )
157	157	),
158		~~- $this->getSkin()->linkKnown(~~
	158	+ Linker::linkKnown(
159	159	Title::newFromText( wfMsgForContent( 'helppage' ) ),
160	160	wfMsg( 'help' )
161	161	),
162		~~- $this->getSkin()->linkKnown(~~
	162	+ Linker::linkKnown(
163	163	Title::newFromText( wfMsgForContent( 'faqpage' ) ),
164	164	wfMsg( 'faq' )
165	165	),
166		~~- $this->getSkin()->specialLink( 'Specialpages' )~~
	166	+ Linker::specialLink( 'Specialpages' )
167	167	);
168	168
169	169	/* show links to different language variants */
—	—	@@ -173,14 +173,14 @@
174	174	$s[] = $this->extensionTabLinks();
175	175	}
176	176	if ( $wgUser->isLoggedIn() ) {
177		~~- $s[] = $this->getSkin()->linkKnown(~~
	177	+ $s[] = Linker::linkKnown(
178	178	$lo,
179	179	wfMsg( 'logout' ),
180	180	array(),
181	181	$q
182	182	);
183	183	} else {
184		~~- $s[] = $this->getSkin()->linkKnown(~~
	184	+ $s[] = Linker::linkKnown(
185	185	$li,
186	186	wfMsg( 'login' ),
187	187	array(),
—	—	@@ -238,7 +238,7 @@
239	239	$s .= $this->menuHead( 'qbedit' );
240	240	$s .= '<strong>' . $this->editThisPage() . '</strong>';
241	241
242		~~- $s .= $sep . $this->getSkin()->linkKnown(~~
	242	+ $s .= $sep . Linker::linkKnown(
243	243	Title::newFromText( wfMsgForContent( 'edithelppage' ) ),
244	244	wfMsg( 'edithelp' )
245	245	);
—	—	@@ -289,7 +289,7 @@
290	290
291	291	$s .= $this->menuHead( 'qbmyoptions' );
292	292	if ( $wgUser->isLoggedIn() ) {
293		~~- $tl = $this->getSkin()->link(~~
	293	+ $tl = Linker::link(
294	294	$wgUser->getTalkPage(),
295	295	wfMsg( 'mytalk' ),
296	296	array(),
—	—	@@ -300,30 +300,30 @@
301	301	$tl .= ' *';
302	302	}
303	303
304		~~- $s .= $this->getSkin()->link(~~
	304	+ $s .= Linker::link(
305	305	$wgUser->getUserPage(),
306	306	wfMsg( 'mypage' ),
307	307	array(),
308	308	array(),
309	309	array( 'known', 'noclasses' )
310		~~- ) . $sep . $tl . $sep . $this->getSkin()->specialLink( 'Watchlist' )~~
	310	+ ) . $sep . $tl . $sep . Linker::specialLink( 'Watchlist' )
311	311	. $sep .
312		~~- $this->getSkin()->link(~~
	312	+ Linker::link(
313	313	SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
314	314	wfMsg( 'mycontris' ),
315	315	array(),
316	316	array(),
317	317	array( 'known', 'noclasses' )
318		~~- ) . $sep . $this->getSkin()->specialLink( 'Preferences' )~~
319		~~- . $sep . $this->getSkin()->specialLink( 'Userlogout' );~~
	318	+ ) . $sep . Linker::specialLink( 'Preferences' )
	319	+ . $sep . Linker::specialLink( 'Userlogout' );
320	320	} else {
321		~~- $s .= $this->getSkin()->specialLink( 'Userlogin' );~~
	321	+ $s .= Linker::specialLink( 'Userlogin' );
322	322	}
323	323
324	324	$s .= $this->menuHead( 'qbspecialpages' )
325		~~- . $this->getSkin()->specialLink( 'Newpages' )~~
326		~~- . $sep . $this->getSkin()->specialLink( 'Listfiles' )~~
327		~~- . $sep . $this->getSkin()->specialLink( 'Statistics' );~~
	325	+ . Linker::specialLink( 'Newpages' )
	326	+ . $sep . Linker::specialLink( 'Listfiles' )
	327	+ . $sep . Linker::specialLink( 'Statistics' );
328	328	if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
329	329	$s .= $sep . $this->getUploadLink();
330	330	}
—	—	@@ -335,7 +335,7 @@
336	336	. wfMsg( 'sitesupport' ) . '</a>';
337	337	}
338	338
339		~~- $s .= $sep . $this->getSkin()->link(~~
	339	+ $s .= $sep . Linker::link(
340	340	SpecialPage::getTitleFor( 'Specialpages' ),
341	341	wfMsg( 'moredotdotdot' ),
342	342	array(),
Index: trunk/phase3/skins/Standard.php
—	—	@@ -79,7 +79,7 @@
80	80	$s .= "\n<br />" . $wgLang->pipeList( array(
81	81	$this->getSkin()->mainPageLink(),
82	82	$this->getSkin()->aboutLink(),
83		~~- $this->getSkin()->specialLink( 'Recentchanges' ),~~
	83	+ Linker::specialLink( 'Recentchanges' ),
84	84	$this->searchForm() ) )
85	85	. '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
86	86
—	—	@@ -133,8 +133,8 @@
134	134	if ( $barnumber == 1 ) {
135	135	// only show watchlist link if logged in
136	136	if( $wgUser->isLoggedIn() ) {
137		~~- $s.= $this->getSkin()->specialLink( 'Watchlist' ) ;~~
138		~~- $s .= $sep . $this->getSkin()->linkKnown(~~
	137	+ $s.= Linker::specialLink( 'Watchlist' ) ;
	138	+ $s .= $sep . Linker::linkKnown(
139	139	SpecialPage::getTitleFor( 'Contributions' ),
140	140	wfMsg( 'mycontris' ),
141	141	array(),
—	—	@@ -197,10 +197,7 @@
198	198	$link = $nstext . ':' . $link;
199	199	}
200	200
201		~~- $s .= $this->getSkin()->link(~~
202		~~- Title::newFromText( $link ),~~
203		~~- $text~~
204		~~- );~~
	201	+ $s .= Linker::link( Title::newFromText( $link ), $text );
205	202	} elseif( $this->getSkin()->getTitle()->getNamespace() != NS_SPECIAL ) {
206	203	# we just throw in a "New page" text to tell the user that he's in edit mode,
207	204	# and to avoid messing with the separator that is prepended to the next item
—	—	@@ -270,7 +267,7 @@
271	268	$s .= $this->getUploadLink() . $sep;
272	269	}
273	270
274		~~- $s .= $this->getSkin()->specialLink( 'Specialpages' );~~
	271	+ $s .= Linker::specialLink( 'Specialpages' );
275	272
276	273	global $wgSiteSupportPage;
277	274	if( $wgSiteSupportPage ) {
Index: trunk/phase3/skins/Vector.php
—	—	@@ -106,10 +106,10 @@
107	107	}
108	108	if ( isset($link['tooltiponly']) && $link['tooltiponly'] ) {
109	109	$nav[$section][$key]['key'] =
110		~~- $this->skin->tooltip( $xmlID );~~
	110	+ Linker::tooltip( $xmlID );
111	111	} else {
112	112	$nav[$section][$key]['key'] =
113		~~- $this->skin->tooltipAndAccesskey( $xmlID );~~
	113	+ Linker::tooltipAndAccesskey( $xmlID );
114	114	}
115	115	}
116	116	}
—	—	@@ -204,7 +204,7 @@
205	205	<!-- panel -->
206	206	<div id="mw-panel" class="noprint">
207	207	<!-- logo -->
208		- <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
	208	+ <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Linker::tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
209	209	<!-- /logo -->
210	210	<?php $this->renderPortals( $this->data['sidebar'] ); ?>
211	211	</div>
—	—	@@ -279,7 +279,7 @@
280	280	$msg = $name;
281	281	}
282	282	?>
283		~~-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>>~~
	283	+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
284	284	<h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5>
285	285	<div class="body">
286	286	<?php
Index: trunk/phase3/skins/Nostalgia.php
—	—	@@ -64,7 +64,7 @@
65	65	$sep = " \|\n";
66	66
67	67	$s = $this->getSkin()->mainPageLink() . $sep
68		~~- . $this->getSkin()->specialLink( 'Recentchanges' );~~
	68	+ . Linker::specialLink( 'Recentchanges' );
69	69
70	70	if ( $wgOut->isArticle() ) {
71	71	$s .= $sep . '<strong>' . $this->editThisPage() . '</strong>' . $sep . $this->talkLink() .
—	—	@@ -75,22 +75,22 @@
76	76	$s .= $this->variantLinks();
77	77	$s .= $this->extensionTabLinks();
78	78	if ( $wgUser->isAnon() ) {
79		~~- $s .= $sep . $this->getSkin()->specialLink( 'Userlogin' );~~
	79	+ $s .= $sep . Linker::specialLink( 'Userlogin' );
80	80	} else {
81	81	/* show user page and user talk links */
82		~~- $s .= $sep . $this->getSkin()->link( $wgUser->getUserPage(), wfMsgHtml( 'mypage' ) );~~
83		~~- $s .= $sep . $this->getSkin()->link( $wgUser->getTalkPage(), wfMsgHtml( 'mytalk' ) );~~
	82	+ $s .= $sep . Linker::link( $wgUser->getUserPage(), wfMsgHtml( 'mypage' ) );
	83	+ $s .= $sep . Linker::link( $wgUser->getTalkPage(), wfMsgHtml( 'mytalk' ) );
84	84	if ( $wgUser->getNewtalk() ) {
85	85	$s .= ' *';
86	86	}
87	87	/* show watchlist link */
88		~~- $s .= $sep . $this->getSkin()->specialLink( 'Watchlist' );~~
	88	+ $s .= $sep . Linker::specialLink( 'Watchlist' );
89	89	/* show my contributions link */
90		~~- $s .= $sep . $this->getSkin()->link(~~
	90	+ $s .= $sep . Linker::link(
91	91	SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
92	92	wfMsgHtml( 'mycontris' ) );
93	93	/* show my preferences link */
94		~~- $s .= $sep . $this->getSkin()->specialLink( 'Preferences' );~~
	94	+ $s .= $sep . Linker::specialLink( 'Preferences' );
95	95	/* show upload file link */
96	96	if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
97	97	$s .= $sep . $this->getUploadLink();
Index: trunk/phase3/skins/MonoBook.php
—	—	@@ -112,7 +112,7 @@
113	113	</div>
114	114	<div class="portlet" id="p-logo">
115	115	<?php
116		~~- $logoAttribs = array() + $skin->tooltipAndAccesskeyAttribs('p-logo');~~
	116	+ $logoAttribs = array() + Linker::tooltipAndAccesskeyAttribs('p-logo');
117	117	$logoAttribs['style'] = "background-image: url({$this->data['logopath']});";
118	118	$logoAttribs['href'] = $this->data['nav_urls']['mainpage']['href'];
119	119	echo Html::element( 'a', $logoAttribs );
—	—	@@ -212,12 +212,12 @@
213	213	$linkAttribs = array( 'href' => $tab['href'] );
214	214
215	215	if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) {
216		~~- $title = $skin->titleAttrib( "ca-$key" );~~
	216	+ $title = Linker::titleAttrib( "ca-$key" );
217	217	if ( $title !== false ) {
218	218	$linkAttribs['title'] = $title;
219	219	}
220	220	} else {
221		~~- $linkAttribs += $skin->tooltipAndAccesskeyAttribs( "ca-$key" );~~
	221	+ $linkAttribs += Linker::tooltipAndAccesskeyAttribs( "ca-$key" );
222	222	}
223	223	$linkHtml = Html::element( 'a', $linkAttribs, $tab['text'] );
224	224
—	—	@@ -279,7 +279,7 @@
280	280	/*************************************************************************************************/
281	281	function customBox( $bar, $cont ) {
282	282	$portletAttribs = array( 'class' => 'generated-sidebar portlet', 'id' => Sanitizer::escapeId( "p-$bar" ) );
283		~~- $tooltip = $this->skin->titleAttrib( "p-$bar" );~~
	283	+ $tooltip = Linker::titleAttrib( "p-$bar" );
284	284	if ( $tooltip !== false ) {
285	285	$portletAttribs['title'] = $tooltip;
286	286	}

Status & tagging log

01:28, 21 June 2011 Aaron Schulz (talk | contribs) changed the status of r86240 [removed: new added: ok]