r86244 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r86243‎ \| r86244 \| r86245 >
Date:	22:44, 16 April 2011
Author:	happy-melon
Status:	ok
Tags:
Comment:	Clean up some uses and abuses of the SpecialPage:: static methods in extensions
Modified paths:	/trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php (modified) (history) /trunk/extensions/MassEditRegex/MassEditRegex.class.php (modified) (history) /trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php (modified) (history) /trunk/extensions/UserOptionStats/SpecialUserOptionStats.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MassEditRegex/MassEditRegex.class.php
—	—	@@ -100,7 +100,7 @@
101	101	}
102	102
103	103	$wgOut->addWikiMsg( 'masseditregextext' );
104		~~- $titleObj = SpecialPage::getTitle( 'MassEditRegex' );~~
	104	+ $titleObj = SpecialPage::getTitleFor( 'MassEditRegex' );
105	105
106	106	$wgOut->addHTML(
107	107	Xml::openElement('form', array(
Index: trunk/extensions/UserOptionStats/SpecialUserOptionStats.php
—	—	@@ -40,9 +40,9 @@
41	41
42	42	if ( !$par ) {
43	43	$opts = array();
44		~~- $name = SpecialPage::getLocalNameFor( 'UserOptionStats' );~~
	44	+ $name = SpecialPage::getTitleFor( 'UserOptionStats' )->getPrefixedText();
45	45	foreach ( $this->getOptions() as $k ) {
46		~~- $opts[] = "[[Special:$name/$k\|$k]]";~~
	46	+ $opts[] = "[[$name/$k\|$k]]";
47	47	}
48	48	$wgOut->addWikiMsg( 'uos-choose', $wgLang->commaList( $opts ) );
49	49	return;
Index: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php
—	—	@@ -101,7 +101,7 @@
102	102	// add the search placeholder
103	103	// $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
104	104	$sk = $wgUser->getSkin();
105		~~- $title = Title :: MakeTitle( NS_SPECIAL, 'Search' );~~
	105	+ $title = Title::MakeTitle( NS_SPECIAL, 'Search' );
106	106
107	107	// check if the skin already includes the dynamicSearchControl
108	108	global $wgUser;
—	—	@@ -127,7 +127,7 @@
128	128	}
129	129	}
130	130	function dynamicSearchControl() {
131		~~- $title = SpecialPage :: getTitleFor( 'MediaSearch' );~~
	131	+ $title = SpecialPage::getTitleFor( 'MediaSearch' );
132	132	$action = $title->escapeLocalURL();
133	133
134	134	$o = "<div id=\"msms_form_search_row\" class=\"form_search_row\">
—	—	@@ -352,13 +352,13 @@
353	353	$prevnext = '';
354	354	// pagging
355	355	if ( $this->numResultsFound > $this->limit ) {
356		~~- $prevnext = mvViewPrevNext( $this->offset, $this->limit, SpecialPage :: getTitleFor( 'MediaSearch' ), $this->get_httpd_filters_query(), ( $this->num < $this->limit ) );~~
	356	+ $prevnext = mvViewPrevNext( $this->offset, $this->limit, SpecialPage::getTitleFor( 'MediaSearch' ), $this->get_httpd_filters_query(), ( $this->num < $this->limit ) );
357	357	$o .= '<li class="prevnext">' . $prevnext . '</li>';
358	358	}
359	359	$br = '<br />';
360	360	$enddash = '';
361	361
362		~~- $sTitle = Title :: MakeTitle( NS_SPECIAL, 'MvExportSearch' );~~
	362	+ $sTitle = Title::MakeTitle( NS_SPECIAL, 'MvExportSearch' );
363	363
364	364	// force host for script (should be a better way to do this)
365	365	if ( !isset( $_SERVER['HTTP_HOST'] ) )
—	—	@@ -383,7 +383,7 @@
384	384	if ( $wgRequest->getVal( 'limit' ) != '' \|\| $wgRequest->getVal( 'order' ) != '' )
385	385	$q_req .= '&' . http_build_query( array( 'limit' => $this->limit, 'offset' => $this->offset ) );
386	386	$q_req .= '&order=' . $type;
387		~~- $o .= $enddash . '<li class="relevant">' . $sk->makeKnownLinkObj( SpecialPage :: getTitleFor( 'MediaSearch' ),~~
	387	+ $o .= $enddash . '<li class="relevant">' . $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'MediaSearch' ),
388	388	wfMsg( 'mv_most_' . $type ), $q_req ) . '</li>';
389	389	}
390	390	$br = '';
—	—	@@ -413,10 +413,10 @@
414	414
415	415	if( $pmvd->wiki_title ){
416	416	$pMvTitle = new MV_Title( $pmvd->wiki_title );
417		~~- $pAnnoStreamLink = Title :: MakeTitle( MV_NS_STREAM, $pMvTitle->getNearStreamName( 0 ) );~~
	417	+ $pAnnoStreamLink = Title::MakeTitle( MV_NS_STREAM, $pMvTitle->getNearStreamName( 0 ) );
418	418	$clip_desc_txt = 'Segment';
419	419	if($pmvd->Speech_by){
420		~~- $personTitle = Title :: newFromText( $pmvd->Speech_by );~~
	420	+ $personTitle = Title::newFromText( $pmvd->Speech_by );
421	421	$clip_desc_txt = 'Speech By ' . $personTitle->getText();
422	422	}
423	423
—	—	@@ -427,7 +427,7 @@
428	428	$pmeta_out.='<br />Covering: ';
429	429	$coma='';
430	430	foreach($pmvd->category as $cat_titlekey ){
431		~~- $cTitle = $cTitle = Title :: MakeTitle( NS_CATEGORY, $cat_titlekey );~~
	431	+ $cTitle = $cTitle = Title::MakeTitle( NS_CATEGORY, $cat_titlekey );
432	432	$pmeta_out .= $coma . $sk->makeKnownLinkObj( $cTitle, $cTitle->getText() );
433	433	$coma=', ';
434	434	assoc_array_increment( $sideBarLinkBucket, 'category', $cat_titlekey );
—	—	@@ -435,7 +435,7 @@
436	436	}
437	437	if($pmvd->Bill){
438	438	$pmeta_out.='<br />Bill: ';
439		~~- $bTitle = Title :: newFromText( $pmvd->Bill );~~
	439	+ $bTitle = Title::newFromText( $pmvd->Bill );
440	440	$pmeta_out .= $sk->makeKnownLinkObj( $bTitle, $bTitle->getText() );
441	441	assoc_array_increment( $sideBarLinkBucket, 'bill', $pmvd->Bill );
442	442	}
—	—	@@ -443,7 +443,7 @@
444	444	}
445	445	$mvd_cnt_links = '';
446	446	if ( isset ( $mvd->spoken_by ) ) {
447		~~- $ptitle = Title :: MakeTitle( NS_MAIN, $mvd->spoken_by );~~
	447	+ $ptitle = Title::MakeTitle( NS_MAIN, $mvd->spoken_by );
448	448	$mvd_cnt_links .= wfMsg( 'mv_search_spoken_by' ) . ': ' . $sk->makeKnownLinkObj( $ptitle );
449	449	$mvd_cnt_links .= '<br />';
450	450	assoc_array_increment( $sideBarLinkBucket, 'person', $mvd->spoken_by );
—	—	@@ -452,7 +452,7 @@
453	453	$coma = '';
454	454	if ( isset ( $mvd->categories ) ) {
455	455	foreach ( $mvd->categories as $cat_id => $na ) {
456		~~- $cTitle = Title :: MakeTitle( NS_CATEGORY, $cat_id );~~
	456	+ $cTitle = Title::MakeTitle( NS_CATEGORY, $cat_id );
457	457	if ( $mvd_cat_links == '' )
458	458	$mvd_cat_links .= wfMsg( 'mv_search_categories' ) .
459	459	': ';
—	—	@@ -464,7 +464,7 @@
465	465	$coma = '';
466	466	if ( isset ( $mvd->bills ) ) {
467	467	foreach ( $mvd->bills as $bill_id => $na ) {
468		~~- $bTitle = Title :: newFromText( $bill_id );~~
	468	+ $bTitle = Title:: newFromText( $bill_id );
469	469	if ( $mvd_bill_links == '' )
470	470	$mvd_bill_links .= wfMsg( 'mv_search_bills' ) .
471	471	': ';
—	—	@@ -477,9 +477,9 @@
478	478	//if the clip length is < $mvDefaultClipLength get range:
479	479	global $mvDefaultClipLength;
480	480	if( $mvTitle->getSegmentDuration() < $mvDefaultClipLength){
481		~~- $mvStreamTitle = Title :: MakeTitle( MV_NS_STREAM, $mvTitle->getNearStreamName( $mvDefaultClipRange ) );~~
	481	+ $mvStreamTitle = Title::MakeTitle( MV_NS_STREAM, $mvTitle->getNearStreamName( $mvDefaultClipRange ) );
482	482	}else{
483		~~- $mvStreamTitle = Title :: MakeTitle( MV_NS_STREAM, $mvTitle->getNearStreamName( 0 ) );~~
	483	+ $mvStreamTitle = Title::MakeTitle( MV_NS_STREAM, $mvTitle->getNearStreamName( 0 ) );
484	484	}
485	485	// $mvTitle->getStreamName() .'/'.$mvTitle->getStartTime() .'/'. $mvTitle->getEndTime() );
486	486
—	—	@@ -527,7 +527,7 @@
528	528	$first_block = ' first_block';
529	529	$matches = 0;
530	530	$person_out_ary = array();
531		~~- $person_out = MV_SpecialMediaSearch :: auto_complete_person( $this->unified_term_search, 3, 'person_html', $matches, $person_out_ary );~~
	531	+ $person_out = MV_SpecialMediaSearch::auto_complete_person( $this->unified_term_search, 3, 'person_html', $matches, $person_out_ary );
532	532	if ( $person_out != '' \|\| count( $sideBarLinkBucket['person'] ) != 0 ) {
533	533	// for now don't include({$matches})
534	534	$o .= "<div class=\"block{$first_block}\">
—	—	@@ -543,7 +543,7 @@
544	544	if ( in_array( $person_name, $person_out_ary ) )continue;
545	545	if ( $i == $perSectionCount )
546	546	break;
547		~~- $o .= MV_SpecialMediaSearch :: format_ac_line( $person_name, '', '', MV_SpecialMediaSearch :: getPersonImageURL( $person_name ), $format = 'person_html' );~~
	547	+ $o .= MV_SpecialMediaSearch::format_ac_line( $person_name, '', '', MV_SpecialMediaSearch::getPersonImageURL( $person_name ), $format = 'person_html' );
548	548	$i++;
549	549	}
550	550	}
—	—	@@ -551,7 +551,7 @@
552	552	$first_block = '';
553	553	}
554	554	// get categories
555		~~- $category_out = MV_SpecialMediaSearch :: auto_complete_search_categories( $this->unified_term_search, 3, 'block_html', $matches );~~
	555	+ $category_out = MV_SpecialMediaSearch::auto_complete_search_categories( $this->unified_term_search, 3, 'block_html', $matches );
556	556	if ( $category_out != '' \|\| count( $sideBarLinkBucket['category'] ) != 0 ) {
557	557	$o .= '<div class="block' . htmlspecialchars( $first_block ) . '\">
558	558	<h6>' . wfMsg( 'mv_category_results' ) . '</h6>
—	—	@@ -565,7 +565,7 @@
566	566	foreach ( $cAry as $cat_name => $count ) {
567	567	if ( $i == $perSectionCount )
568	568	break;
569		~~- $o .= MV_SpecialMediaSearch :: format_ac_line( $cat_name, '', $catNStxt . ':', 'no_image', $format = 'block_html' );~~
	569	+ $o .= MV_SpecialMediaSearch::format_ac_line( $cat_name, '', $catNStxt . ':', 'no_image', $format = 'block_html' );
570	570	$i++;
571	571	}
572	572	}
—	—	@@ -573,7 +573,7 @@
574	574	$first_block = '';
575	575	}
576	576	// get bills:
577		~~- $bill_out = MV_SpecialMediaSearch :: auto_complete_category( 'Bill', $this->unified_term_search, 3, 'block_html', $matches );~~
	577	+ $bill_out = MV_SpecialMediaSearch::auto_complete_category( 'Bill', $this->unified_term_search, 3, 'block_html', $matches );
578	578	if ( $bill_out != '' \|\| count( $sideBarLinkBucket['bill'] ) != 0 ) {
579	579	global $wgContLang;
580	580	$o .= '<div class=\"block ' . htmlspecialchars( $first_block ) . '">
—	—	@@ -587,7 +587,7 @@
588	588	foreach ( $bAry as $bill_name => $count ) {
589	589	if ( $i == $perSectionCount )
590	590	break;
591		~~- $o .= MV_SpecialMediaSearch :: format_ac_line( $bill_name, '', '', 'no_image', $format = 'block_html' );~~
	591	+ $o .= MV_SpecialMediaSearch::format_ac_line( $bill_name, '', '', 'no_image', $format = 'block_html' );
592	592	$i++;
593	593	}
594	594	}
—	—	@@ -595,7 +595,7 @@
596	596	$first_block = '';
597	597	}
598	598	// intrest out is just simple title matching (for now)
599		~~- $intrest_out = MV_SpecialMediaSearch :: auto_complete_category( 'Interest_Group', $this->unified_term_search, 3, 'block_html', $matches );~~
	599	+ $intrest_out = MV_SpecialMediaSearch::auto_complete_category( 'Interest_Group', $this->unified_term_search, 3, 'block_html', $matches );
600	600	if ( $intrest_out != '' ) {
601	601	$o .= "<div class=\"block{$first_block}\">
602	602	<h6>" . wfMsg( 'mv_intrest_group_results' ) . "</h6>
—	—	@@ -705,7 +705,7 @@
706	706	global $wgOut, $mvgIP;
707	707	global $mvDefaultSearchVideoPlaybackRes;
708	708
709		~~- $mvd = MV_Index :: getMVDbyId( $mvd_id );~~
	709	+ $mvd = MV_Index::getMVDbyId( $mvd_id );
710	710	if ( count( $mvd ) != 0 ) {
711	711	$mvTitle = new MV_Title( $mvd->wiki_title );
712	712	// validate title and load stream ref:
—	—	@@ -846,7 +846,7 @@
847	847	return $o;
848	848	}
849	849	function getSearchLink() {
850		~~- return SpecialPage :: getTitleFor( 'MediaSearch' ) .~~
	850	+ return SpecialPage::getTitleFor( 'MediaSearch' ) .
851	851	$this->get_httpd_filters_query();
852	852	}
853	853	/*
—	—	@@ -883,9 +883,9 @@
884	884	$disp = 'none';
885	885	}
886	886	// make the missing person image ref:
887		~~- $imgTitle = Title :: makeTitle( NS_IMAGE, $person_name . '.jpg' );~~
	887	+ $imgTitle = Title::makeTitle( NS_IMAGE, $person_name . '.jpg' );
888	888	if ( !$imgTitle->exists() ) {
889		~~- $imgTitle = Title :: makeTitle( NS_IMAGE, MV_MISSING_PERSON_IMG );~~
	889	+ $imgTitle = Title::makeTitle( NS_IMAGE, MV_MISSING_PERSON_IMG );
890	890	}
891	891
892	892	$img = wfFindFile( $imgTitle );
—	—	@@ -945,25 +945,25 @@
946	946	// make sure people know they can "search" too (formated by
947	947	$out = 'do_search\|' . wfMsg( 'mv_search_transcripts_for', '<B>$1</B>' ) . '\|no_image' . "\n";
948	948	// get keywords
949		~~- $category_out = MV_SpecialMediaSearch :: auto_complete_search_categories( $val, 3 );~~
	949	+ $category_out = MV_SpecialMediaSearch::auto_complete_search_categories( $val, 3 );
950	950	if ( $category_out != '' ) {
951	951	$out .= $catNStxt . ':Categories\|<h6>' . wfMsg( 'mv_category_matches' ) . '</h6>\|no_image' . "\n";
952	952	$out .= $category_out;
953	953	}
954	954	// get people
955		~~- $person_out = MV_SpecialMediaSearch :: auto_complete_person( $val, 3 );~~
	955	+ $person_out = MV_SpecialMediaSearch::auto_complete_person( $val, 3 );
956	956	if ( $person_out != '' ) {
957	957	$out .= $catNStxt . ':Person\|<h6>' . wfMsg( 'mv_people_matches' ) . '</h6>\|no_image' . "\n";
958	958	$out .= $person_out;
959	959	}
960	960	// get bills
961		~~- $bill_out = MV_SpecialMediaSearch :: auto_complete_category( 'Bill', $val, 3 );~~
	961	+ $bill_out = MV_SpecialMediaSearch::auto_complete_category( 'Bill', $val, 3 );
962	962	if ( $bill_out != '' ) {
963	963	$out .= $catNStxt . ':Bill\|<h6>' . wfMsg( 'mv_bill_matches' ) . '</h6>\|no_image' . "\n";
964	964	$out .= $bill_out;
965	965	}
966	966	// get interests
967		~~- $intrest_out = MV_SpecialMediaSearch :: auto_complete_category( 'Interest_Group', $val, 3 );~~
	967	+ $intrest_out = MV_SpecialMediaSearch::auto_complete_category( 'Interest_Group', $val, 3 );
968	968	if ( $intrest_out != '' ) {
969	969	$out .= $catNStxt . ':Interest Group\|<h6>' . wfMsg( 'mv_interest_group_matches' ) . '</h6>\|no_image' . "\n";
970	970	$out .= $intrest_out;
—	—	@@ -985,7 +985,7 @@
986	986	$out = '';
987	987	$catNStxt = $wgContLang->getNsText( NS_CATEGORY );
988	988	while ( $row = $dbr->fetchObject( $result ) ) {
989		~~- $out .= MV_SpecialMediaSearch :: format_ac_line( $row->page_title, $val, $catNStxt . ':', 'no_image', $format );~~
	989	+ $out .= MV_SpecialMediaSearch::format_ac_line( $row->page_title, $val, $catNStxt . ':', 'no_image', $format );
990	990	}
991	991	return $out;
992	992	}
—	—	@@ -1008,7 +1008,7 @@
1009	1009	return '';
1010	1010	$out = '';
1011	1011	while ( $row = $dbr->fetchObject( $result ) ) {
1012		~~- $out .= MV_SpecialMediaSearch :: format_ac_line( $row->cl_sortkey, $val, '', 'no_image', $format );~~
	1012	+ $out .= MV_SpecialMediaSearch::format_ac_line( $row->cl_sortkey, $val, '', 'no_image', $format );
1013	1013	}
1014	1014	return $out;
1015	1015	}
—	—	@@ -1040,12 +1040,12 @@
1041	1041
1042	1042	foreach($person_ary as $person_name=>$na){
1043	1043	// make sure the person page exists:
1044		~~- $personTitle = Title :: makeTitle( NS_MAIN, $person_name );~~
	1044	+ $personTitle = Title::makeTitle( NS_MAIN, $person_name );
1045	1045	if ( $personTitle->exists() ) {
1046	1046	// dont try and get person full name from semantic table if available
1047	1047	$person_full_name = $person_name;
1048	1048	// format and output the line:
1049		~~- $out .= MV_SpecialMediaSearch :: format_ac_line( $person_full_name, $val, '', MV_SpecialMediaSearch :: getPersonImageURL( $person_name ), $format );~~
	1049	+ $out .= MV_SpecialMediaSearch::format_ac_line( $person_full_name, $val, '', MV_SpecialMediaSearch::getPersonImageURL( $person_name ), $format );
1050	1050	}
1051	1051	}
1052	1052	// $out.='</ul>';
—	—	@@ -1080,9 +1080,9 @@
1081	1081	}
1082	1082	function getPersonImageURL( $person_name ) {
1083	1083	// make the missing person image ref:
1084		~~- $imgTitle = Title :: makeTitle( NS_IMAGE, $person_name . '.jpg' );~~
	1084	+ $imgTitle = Title::makeTitle( NS_IMAGE, $person_name . '.jpg' );
1085	1085	if ( !$imgTitle->exists() ) {
1086		~~- $imgTitle = Title :: makeTitle( NS_IMAGE, MV_MISSING_PERSON_IMG );~~
	1086	+ $imgTitle = Title::makeTitle( NS_IMAGE, MV_MISSING_PERSON_IMG );
1087	1087	}
1088	1088	$img = wfFindFile( $imgTitle );
1089	1089	if ( !$img ) {
—	—	@@ -1113,7 +1113,7 @@
1114	1114	if ( $format == 'block_html' \|\| $format == 'person_html' ) {
1115	1115	global $wgUser;
1116	1116	$sk = $wgUser->getSkin();
1117		~~- $title = Title :: newFromText( $prefix . $page_title );~~
	1117	+ $title = Title::newFromText( $prefix . $page_title );
1118	1118
1119	1119	if ( $format == 'block_html' )
1120	1120	return "<p class=\"normal_match\">" . $sk->makeKnownLinkObj( $title, '<span>' .
Index: trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php
—	—	@@ -57,8 +57,7 @@
58	58	function getPageHeader() {
59	59	// show the names of the three lists of pages, with the one
60	60	// corresponding to the current "mode" not being linked
61		~~- $approvedPagesPage = SpecialPage::getPage( 'ApprovedRevs' );~~
62		~~- $approvedPagesTitle = SpecialPage::getPage( 'ApprovedRevs' )->getTitle();~~
	61	+ $approvedPagesTitle = SpecialPage::getTitleFor( 'ApprovedRevs' );
63	62	$navLine = wfMsg( 'approvedrevs-view' ) . ' ';
64	63
65	64	if ( $this->mMode == '' ) {

Status & tagging log

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