http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75680
Revision: 75680
Author: reedy
Date: 2010-10-29 21:55:29 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Another big cull on unused variables and such
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.class.php
trunk/extensions/AbuseFilter/AbuseFilter.parser.php
trunk/extensions/AbuseFilter/SpecialAbuseLog.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewHistory.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewRevert.php
trunk/extensions/CategoryTree/CategoryTree.php
trunk/extensions/CentralAuth/CentralAuthUser.php
trunk/extensions/CentralAuth/SpecialCentralAuth.php
trunk/extensions/CentralNotice/SpecialCentralNotice.php
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
trunk/extensions/CharInsert/CharInsert.php
trunk/extensions/CheckUser/CheckUser.php
trunk/extensions/Collection/Collection.session.php
trunk/extensions/Collection/Collection.suggest.php
trunk/extensions/CommunityApplications/SpecialCommunityApplications.php
trunk/extensions/CommunityHiring/SpecialCommunityHiring.php
trunk/extensions/CommunityVoice/Modules/Ratings.php
trunk/extensions/ConfirmEdit/ConfirmEdit_body.php
trunk/extensions/ContactPage/SpecialContact.php
trunk/extensions/ContributionReporting/ContributionReporting.php
trunk/extensions/ContributionReporting/ContributionStatistics_body.php
trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
trunk/extensions/ContributionScores/ContributionScores.php
trunk/extensions/ContributionScores/ContributionScores_body.php
trunk/extensions/DoubleWiki/DoubleWiki_body.php
trunk/extensions/DynamicPageList/DPL.php
trunk/extensions/DynamicPageList/DPLMain.php
trunk/extensions/DynamicPageList/DynamicPageListInclude.php
trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php
trunk/extensions/GlobalUsage/GlobalUsageHooks.php
trunk/extensions/InputBox/InputBox.classes.php
trunk/extensions/LabeledSectionTransclusion/lst.php
trunk/extensions/MWSearch/MWSearch_body.php
trunk/extensions/MWSearch/luceneUpdate.php
trunk/extensions/OAI/OAIHarvest.php
trunk/extensions/OggHandler/OggHandler_body.php
trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg.php
trunk/extensions/Oversight/HideRevision_body.php
trunk/extensions/ProofreadPage/ProofreadPage_body.php
trunk/extensions/Quiz/Quiz.class.php
trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php
trunk/extensions/ReaderFeedback/ReaderFeedback.php
trunk/extensions/ReaderFeedback/phplot-5.0.5/phplot.php
trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
trunk/extensions/ReaderFeedback/svggraph/svgGraph.php
trunk/extensions/SecurePoll/includes/main/Store.php
trunk/extensions/TitleBlacklist/TitleBlacklist.list.php
trunk/extensions/TitleKey/TitleKey_body.php
trunk/extensions/UniversalEditButton/UniversalEditButton.php
trunk/extensions/intersection/DynamicPageList.php
trunk/extensions/wikihiero/wh_main.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.class.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.class.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/AbuseFilter/AbuseFilter.class.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -1029,7 +1029,6 @@
array( $rule_desc ) ) . "<br />\n";
break;
case 'rangeblock':
- global $wgUser;
$filterUser = AbuseFilter::getFilterUser();
$range = IP::toHex( wfGetIP() );
@@ -1194,8 +1193,6 @@
}
public static function throttleKey( $throttleId, $type, $title ) {
- $identifier = '';
-
$types = explode( ',', $type );
$identifiers = array();
Modified: trunk/extensions/AbuseFilter/AbuseFilter.parser.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.parser.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/AbuseFilter/AbuseFilter.parser.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -301,7 +301,6 @@
throw new AFPUserVisibleException( 'dividebyzero',
$pos, array( $a ) );
}
- $data = null;
if ( $op == '*' ) {
$data = $a * $b;
} elseif ( $op == '/' ) {
Modified: trunk/extensions/AbuseFilter/SpecialAbuseLog.php
===================================================================
--- trunk/extensions/AbuseFilter/SpecialAbuseLog.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/AbuseFilter/SpecialAbuseLog.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -354,8 +354,6 @@
$user .= ' (' . WikiMap::getWikiName( $row->afl_wiki )
. ')';
}
- $description = '';
-
$timestamp = $wgLang->timeanddate( $row->afl_timestamp, true );
$actions_taken = $row->afl_actions;
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -185,7 +185,7 @@
$afh_row['afh_flags'] = implode( ',', $flags );
$afh_row['afh_filter'] = $new_id;
- $afh_row['afh_id'] = $history_id =
$dbw->nextSequenceValue( 'abuse_filter_af_id_seq' );
+ $afh_row['afh_id'] = $dbw->nextSequenceValue(
'abuse_filter_af_id_seq' );
// Do the update
$dbw->insert( 'abuse_filter_history', $afh_row,
__METHOD__ );
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewHistory.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewHistory.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewHistory.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -124,8 +124,6 @@
$row = $this->mCurrentRow;
- $formatted = '';
-
switch( $name ) {
case 'afh_timestamp':
$title = SpecialPage::getTitleFor(
'AbuseFilter',
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -7,8 +7,6 @@
function show() {
global $wgUser, $wgOut, $wgRequest;
- $sk = $wgUser->getSkin();
-
// Status info...
$this->showStatus();
@@ -57,7 +55,6 @@
extract( $optarray );
# Options form
- $options = '';
$fields = array();
$fields['abusefilter-list-options-deleted'] =
Xml::radioLabel(
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewRevert.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewRevert.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewRevert.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -57,8 +57,6 @@
$list = array();
foreach ( $results as $result ) {
- $displayActions = array();
-
global $wgLang;
$displayActions = array_map(
array( 'AbuseFilter',
'getActionDisplay' ),
Modified: trunk/extensions/CategoryTree/CategoryTree.php
===================================================================
--- trunk/extensions/CategoryTree/CategoryTree.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/CategoryTree/CategoryTree.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -361,8 +361,6 @@
function efCategoryTreeOutputPageMakeCategoryLinks( $out, &$categories,
&$links ) {
global $wgCategoryTreePageCategoryOptions;
- $ct = new CategoryTree( $wgCategoryTreePageCategoryOptions );
-
foreach ( $categories as $category => $type ) {
$links[$type][] = efCategoryTreeParserHook( $category,
$wgCategoryTreePageCategoryOptions, null, true );
}
Modified: trunk/extensions/CentralAuth/CentralAuthUser.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuthUser.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/CentralAuth/CentralAuthUser.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -604,7 +604,7 @@
// If we've got an authenticated password to work with, we can
// also assume their e-mails are useful for this purpose...
if ( $passwords ) {
- foreach ( $migrationSet as $wiki => $local ) {
+ foreach ( $migrationSet as $local ) {
if ( $local['email'] != ''
&& $local['emailAuthenticated']
&& $this->matchHashes( $passwords,
$local['id'], $local['password'] ) ) {
@@ -1561,7 +1561,6 @@
}
// And we have to fetch groups separately, sigh...
- $groups = array();
$result = $db->select( 'user_groups',
array( 'ug_group' ),
array( 'ug_user' => $data['id'] ),
Modified: trunk/extensions/CentralAuth/SpecialCentralAuth.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialCentralAuth.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/CentralAuth/SpecialCentralAuth.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -103,7 +103,6 @@
if ( !$status->isGood() ) {
$this->showStatusError( $status->getWikiText()
);
} else {
- global $wgLang;
$this->showSuccess(
'centralauth-admin-delete-success', $this->mUserName );
$deleted = true;
$this->logAction( 'delete', $this->mUserName,
$wgRequest->getVal( 'reason' ) );
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -1302,8 +1302,6 @@
* Update the preferred/not preferred state of a campaign
*/
function updatePreferred( $noticeName, $isPreferred ) {
- global $wgOut;
-
if ( !$this->noticeExists( $noticeName ) ) {
$this->showError( 'centralnotice-doesnt-exist' );
} else {
@@ -1487,7 +1485,7 @@
// Remove disassociated countries
$removeCountries = array_diff( $oldCountries, $newCountries );
if ( $removeCountries ) {
- $res = $dbw->delete( 'cn_notice_countries',
+ $dbw->delete( 'cn_notice_countries',
array( 'nc_notice_id' => $row->not_id,
'nc_country' => $removeCountries )
);
}
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -628,7 +628,7 @@
} else {
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
- $res = $dbw->delete( 'cn_templates',
+ $dbw->delete( 'cn_templates',
array( 'tmp_id' => $id ),
__METHOD__
);
Modified: trunk/extensions/CharInsert/CharInsert.php
===================================================================
--- trunk/extensions/CharInsert/CharInsert.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/CharInsert/CharInsert.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -94,11 +94,6 @@
} else {
$inline = charInsertDisplay( $start . $end );
}
- if( $title ) {
- $extra = ' title="' . htmlspecialchars( $title ) . '"';
- } else {
- $extra = '';
- }
return Xml::element( 'a',
array(
'onclick' => "insertTags('$estart','$eend','');return
false",
Modified: trunk/extensions/CheckUser/CheckUser.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/CheckUser/CheckUser.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -145,7 +145,6 @@
* Saves user data into the cu_changes table
*/
function efUpdateCUPasswordResetData( $user, $ip, $account ) {
- wfLoadExtensionMessages( 'CheckUser' );
// Get XFF header
$xff = wfGetForwardedFor();
list( $xff_ip, $trusted ) = efGetClientIPfromXFF( $xff );
@@ -283,7 +282,7 @@
$trusted = true;
// Check each IP, assuming they are separated by commas
$ips = explode( ',', $xff );
- foreach ( $ips as $n => $ip ) {
+ foreach ( $ips as $ip ) {
$ip = trim( $ip );
// If it is a valid IP, not a hash or such
if ( IP::isIPAddress( $ip ) ) {
Modified: trunk/extensions/Collection/Collection.session.php
===================================================================
--- trunk/extensions/Collection/Collection.session.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/Collection/Collection.session.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -116,14 +116,14 @@
if ( isset( $coll['items'] ) ) {
$batch = new LinkBatch;
$lc = LinkCache::singleton();
- foreach ( $coll['items'] as $index => $item ) {
+ foreach ( $coll['items'] as $item ) {
if ( $item['type'] == 'article' ) {
$t = Title::newFromText( $item['title']
);
$batch->addObj( $t );
}
}
$batch->execute();
- foreach ( $coll['items'] as $index => $item ) {
+ foreach ( $coll['items'] as $item ) {
if ( $item['type'] == 'article' ) {
$t = Title::newFromText( $item['title']
);
if ( $t && !$lc->isBadLink(
$t->getPrefixedDbKey() ) ) {
Modified: trunk/extensions/Collection/Collection.suggest.php
===================================================================
--- trunk/extensions/Collection/Collection.suggest.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/Collection/Collection.suggest.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -461,7 +461,7 @@
// normalize:
$lc_max = 0;
- foreach ( $linkcount as $link => $count ) {
+ foreach ( $linkcount as $count ) {
if ( $count > $lc_max ) {
$lc_max = $count;
}
@@ -481,7 +481,7 @@
return $result;
} else {
// cheaper algorithm: just count links
- foreach ( $linkmap as $alias => $linked ) {
+ foreach ( $linkmap as $linked ) {
foreach ( $linked as $link => $dummy ) {
$linkcount[$link] = 1;
}
Modified:
trunk/extensions/CommunityApplications/SpecialCommunityApplications.php
===================================================================
--- trunk/extensions/CommunityApplications/SpecialCommunityApplications.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/CommunityApplications/SpecialCommunityApplications.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -3,7 +3,6 @@
class SpecialCommunityApplications extends SpecialPage {
function __construct() {
parent::__construct( 'CommunityApplications',
'view-community-applications' );
- wfLoadExtensionMessages( 'CommunityApplications' );
}
function execute($par) {
Modified: trunk/extensions/CommunityHiring/SpecialCommunityHiring.php
===================================================================
--- trunk/extensions/CommunityHiring/SpecialCommunityHiring.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/CommunityHiring/SpecialCommunityHiring.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -3,11 +3,10 @@
class SpecialCommunityHiring extends SpecialPage {
function __construct() {
parent::__construct( 'CommunityHiring' );
- wfLoadExtensionMessages( 'CommunityHiring' );
}
function execute( $par ) {
- global $wgRequest, $wgOut;
+ global $wgOut;
$wgOut->setPageTitle( wfMsg( 'communityhiring-header' ) );
Modified: trunk/extensions/CommunityVoice/Modules/Ratings.php
===================================================================
--- trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -127,7 +127,7 @@
/* Static Functions */
public static function register() {
- global $wgParser, $wgAjaxExportList, $wgHooks;
+ global $wgParser, $wgAjaxExportList;
// Register the hook with the parser
$wgParser->setHook( 'ratings:scale', array( __CLASS__,
'renderScale' ) );
// Register ajax response hook
@@ -336,7 +336,6 @@
$rating,
$article
) {
- global $wgUser;
// Adds vote and checks for success
if ( self::addVote( $category, $title, $rating ) ) {
// Gets new rating data
Modified: trunk/extensions/ConfirmEdit/ConfirmEdit_body.php
===================================================================
--- trunk/extensions/ConfirmEdit/ConfirmEdit_body.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/ConfirmEdit/ConfirmEdit_body.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -584,7 +584,6 @@
$this->trigger = "post-badlogin login '" .
$u->getName() . "'";
if ( !$this->passCaptcha() ) {
- $message = wfMsg( 'captcha-badlogin-fail' );
// Emulate a bad-password return to confuse the
shit out of attackers
$retval = LoginForm::WRONG_PASS;
return false;
Modified: trunk/extensions/ContactPage/SpecialContact.php
===================================================================
--- trunk/extensions/ContactPage/SpecialContact.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/ContactPage/SpecialContact.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -120,7 +120,6 @@
*/
function __construct( $target ) {
global $wgRequest, $wgUser;
- global $wgCaptchaClass;
$this->target = $target;
$this->text = $wgRequest->getText( 'wpText' );
@@ -319,8 +318,8 @@
function doSubmit() {
global $wgOut, $wgUser;
- global $wgEnableEmail, $wgUserEmailUseReplyTo,
$wgPasswordSender;
- global $wgContactUser, $wgContactSender, $wgContactSenderName,
$wgContactIncludeIP;
+ global $wgUserEmailUseReplyTo, $wgPasswordSender;
+ global $wgContactSender, $wgContactSenderName,
$wgContactIncludeIP;
$csender = $wgContactSender ? $wgContactSender :
$wgPasswordSender;
$cname = $wgContactSenderName;
Modified: trunk/extensions/ContributionReporting/ContributionReporting.php
===================================================================
--- trunk/extensions/ContributionReporting/ContributionReporting.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/ContributionReporting/ContributionReporting.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -167,7 +167,7 @@
function efContributionReportingTotal_Render() {
$args = func_get_args();
- $parser = array_shift( $args );
+ array_shift( $args );
$fudgeFactor = false;
$start = false;
Modified: trunk/extensions/ContributionReporting/ContributionStatistics_body.php
===================================================================
--- trunk/extensions/ContributionReporting/ContributionStatistics_body.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/ContributionReporting/ContributionStatistics_body.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -166,7 +166,6 @@
public function showCurrencyTotals() {
global $wgOut, $wgLang;
- $msg = '';
if ( $this->mMode == 'range' ) {
$msg = wfMsg( 'contribstats-currency-range-totals',
$wgLang->date( wfTimestamp( TS_MW,
$this->mStartDate ) ),
Modified: trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
===================================================================
--- trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -15,7 +15,7 @@
}
public function execute( $sub ) {
- global $wgRequest, $wgOut, $wgUser, $wgLang, $wgScriptPath,
$egFundraiserStatisticsFundraisers;
+ global $wgOut, $wgLang, $wgScriptPath,
$egFundraiserStatisticsFundraisers;
/* Configuration (this isn't totally static data, some of it
gets built on the fly) */
Modified: trunk/extensions/ContributionScores/ContributionScores.php
===================================================================
--- trunk/extensions/ContributionScores/ContributionScores.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ContributionScores/ContributionScores.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -53,10 +53,6 @@
function efContributionScores_Render(&$parser, $usertext, $metric='score') {
global $wgContribScoreDisableCache;
- wfLoadExtensionMessages( 'ContributionScores' );
-
- $output = "";
-
if ($wgContribScoreDisableCache) {
$parser->disableCache();
}
Modified: trunk/extensions/ContributionScores/ContributionScores_body.php
===================================================================
--- trunk/extensions/ContributionScores/ContributionScores_body.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/ContributionScores/ContributionScores_body.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -80,7 +80,7 @@
ORDER BY rev_count DESC
LIMIT {$limit}";
- $sql = "SELECT user_id, " .
+ $sql = "SELECT user_id, " .
"user_name, " .
"page_count, " .
"rev_count, " .
@@ -136,9 +136,7 @@
return $output;
}
- function execute( $par ) {
- global $wgRequest, $wgOut, $wgHooks;
-
+ function execute( $par ) {
$this->setHeaders();
if( $this->including() ) {
Modified: trunk/extensions/DoubleWiki/DoubleWiki_body.php
===================================================================
--- trunk/extensions/DoubleWiki/DoubleWiki_body.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/DoubleWiki/DoubleWiki_body.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -252,7 +252,6 @@
* The first and last slices are compensated.
*/
$stack = array();
- $counter = 0;
for( $i=0 ; $i < $n ; $i++) {
$bits = preg_split( $this->tags, $left_slices[$i] );
preg_match_all( $this->tags, $left_slices[$i], $m,
PREG_SET_ORDER);
Modified: trunk/extensions/DynamicPageList/DPL.php
===================================================================
--- trunk/extensions/DynamicPageList/DPL.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/DynamicPageList/DPL.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -102,7 +102,7 @@
$greml = $nsize; // remaining lines in current
group
$g = 0;
$offset = 0;
- foreach ( $headings as $heading =>
$headingCount ) {
+ foreach ( $headings as $headingCount ) {
$headingLink = $articles[$nstart -
$offset]->mParentHLink;
$this->mOutput .=
$hlistmode->sItemStart;
$this->mOutput .=
$hlistmode->sHeadingStart . $headingLink . $hlistmode->sHeadingEnd;
@@ -159,7 +159,7 @@
$this->mHListMode = $hlistmode;
$this->mOutput .= $hlistmode->sListStart;
$headingStart = 0;
- foreach ( $headings as $heading =>
$headingCount ) {
+ foreach ( $headings as $headingCount ) {
$headingLink =
$articles[$headingStart]->mParentHLink;
$this->mOutput .=
$hlistmode->sItemStart;
$this->mOutput .=
$hlistmode->sHeadingStart . $headingLink . $hlistmode->sHeadingEnd;
@@ -441,7 +441,6 @@
// ONE section can be marked as
"dominant"; if this section contains multiple entries
// we will create a separate output row
for each value of the dominant section
// the values of all other columns will
be repeated
- $secArray = array();
foreach ( $this->mIncSecLabels as $s =>
$sSecLabel ) {
$sSecLabel = trim( $sSecLabel );
Modified: trunk/extensions/DynamicPageList/DPLMain.php
===================================================================
--- trunk/extensions/DynamicPageList/DPLMain.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/DynamicPageList/DPLMain.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -118,7 +118,6 @@
$sCount = '';
$sCountScroll = '';
$sTitleGE = '';
- $findTitle = '';
$sTitleLE = '';
$scrollDir = '';
@@ -260,7 +259,6 @@
$aSecLabelsNotMatch = array();
$bIncParsed = false; // default is to match raw parameters
- $aSecSeparators = array();
$aSecSeparators = explode( ',',
ExtDynamicPageList::$options['secseparators']['default'] );
$aMultiSecSeparators = explode( ',',
ExtDynamicPageList::$options['multisecseparators']['default'] );
$iDominantSection =
ExtDynamicPageList::$options['dominantsection']['default'];
@@ -3106,7 +3104,7 @@
// Category links from current page
if ( $bAddCategories && $bGoalIsPages && (
$row->cats != '' ) ) {
$artCatNames = explode( ' | ',
$row->cats );
- foreach ( $artCatNames as $iArtCat =>
$artCatName ) {
+ foreach ( $artCatNames as $artCatName )
{
$dplArticle->mCategoryLinks[] =
'[[:Category:' . $artCatName . '|' . str_replace( '_', ' ', $artCatName ) .
']]';
$dplArticle->mCategoryTexts[] =
str_replace( '_', ' ', $artCatName );
}
Modified: trunk/extensions/DynamicPageList/DynamicPageListInclude.php
===================================================================
--- trunk/extensions/DynamicPageList/DynamicPageListInclude.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/DynamicPageList/DynamicPageListInclude.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -345,7 +345,7 @@
if ( $noMatches > 0 ) {
// calculate tag count (ignoring nesting)
- foreach ( $matches[1] as $mmInx => $mm ) {
+ foreach ( $matches[1] as $mm ) {
if ( $mm[0] == '/' ) {
$tags[substr( $mm, 1 )] --;
} else {
Modified: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
===================================================================
--- trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -124,7 +124,6 @@
}
static function getWhitelistInfo( $id = null, $address = null ) {
- $conds = array();
if ($id != null) {
$conds = array( 'gbw_id' => $id );
} elseif ($address != null) {
Modified: trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php
===================================================================
--- trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -257,7 +257,7 @@
? 'globalblocking-modify-submit' :
'globalblocking-block-submit';
$form .= Xml::buildForm( $fields, $submitMsg );
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
if ($this->mModifyForm)
$form .= Html::hidden( 'wpModify', 1 );
Modified: trunk/extensions/GlobalUsage/GlobalUsageHooks.php
===================================================================
--- trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -57,7 +57,6 @@
* Deletes entries from usage table.
*/
public static function onArticleDeleteComplete( $article, $user,
$reason, $id ) {
- $title = $article->getTitle();
$gu = self::getGlobalUsage();
$gu->deleteLinksFromPage( $id );
Modified: trunk/extensions/InputBox/InputBox.classes.php
===================================================================
--- trunk/extensions/InputBox/InputBox.classes.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/InputBox/InputBox.classes.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -273,7 +273,6 @@
$this->mButtonLabel = wfMsgHtml( "postcomment"
);
}
} else {
- $comment = '';
if ( !$this->mButtonLabel ) {
$this->mButtonLabel = wfMsgHtml(
'createarticle' );
}
Modified: trunk/extensions/LabeledSectionTransclusion/lst.php
===================================================================
--- trunk/extensions/LabeledSectionTransclusion/lst.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/LabeledSectionTransclusion/lst.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -321,7 +321,6 @@
* Set up some variables for MW-1.12 parser functions
*/
static function setupPfunc12( $parser, $frame, $args, $func = 'lst' ) {
- global $wgLstLocal;
if ( !count( $args ) ) {
return '';
}
Modified: trunk/extensions/MWSearch/MWSearch_body.php
===================================================================
--- trunk/extensions/MWSearch/MWSearch_body.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/MWSearch/MWSearch_body.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -64,16 +64,10 @@
global $wgContLang, $wgLuceneUseRelated;
$fname = 'LuceneSearch::replacePrefixes';
wfProfileIn($fname);
- $start = 0; $len = 0; // token start pos and length
- $rewritten = ''; // rewritten query
- $rindex = 0; // point to last rewritten character
- $inquotes = false;
-
+
// "search everything" keyword
$allkeyword = wfMsgForContent('searchall');
- $qlen = strlen($query);
-
// quick check, most of the time we don't need any rewriting
if(strpos($query,':')===false){
wfProfileOut($fname);
@@ -164,10 +158,7 @@
function __construct( $lines, $method ) {
global $wgContLang;
- $score = null;
$interwiki = null;
- $namespace = null;
- $title = null;
$line = $lines['result'];
wfDebug( "Lucene line: '$line'\n" );
@@ -500,7 +491,6 @@
}
$suggestion = null;
- $totalHits = null;
$info = null;
$interwiki = null;
Modified: trunk/extensions/MWSearch/luceneUpdate.php
===================================================================
--- trunk/extensions/MWSearch/luceneUpdate.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/MWSearch/luceneUpdate.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -326,7 +326,7 @@
* the index updater daemon was broken or disabled since last build.
*/
function rebuildRecent( $since = null ) {
- global $wgDBname, $options;
+ global $wgDBname;
$fname = 'LuceneBuilder::rebuildDeleted';
if( is_null( $since ) ) {
Modified: trunk/extensions/OAI/OAIHarvest.php
===================================================================
--- trunk/extensions/OAI/OAIHarvest.php 2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/OAI/OAIHarvest.php 2010-10-29 21:55:29 UTC (rev 75680)
@@ -375,8 +375,6 @@
* @param array $data
*/
function applyRevision( $data ) {
- $fname = 'OAIUpdateRecord::applyRevision';
-
$title = $this->getTitle();
$pageId = $this->getArticleId();
$timestamp = $this->getTimestamp( $data['timestamp'] );
Modified: trunk/extensions/OggHandler/OggHandler_body.php
===================================================================
--- trunk/extensions/OggHandler/OggHandler_body.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/OggHandler/OggHandler_body.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -131,7 +131,7 @@
try {
$f = new File_Ogg( $path );
$streams = array();
- foreach ( $f->listStreams() as $streamType =>
$streamIDs ) {
+ foreach ( $f->listStreams() as $streamIDs ) {
foreach ( $streamIDs as $streamID ) {
$stream = $f->getStream( $streamID );
$streams[$streamID] = array(
@@ -527,7 +527,6 @@
$alt = empty( $options['alt'] ) ?
$this->file->getTitle()->getText() : $options['alt'];
$scriptPath = OggHandler::getMyScriptPath();
- $thumbDivAttribs = array();
$showDescIcon = false;
if ( $this->isVideo ) {
Modified: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg.php
===================================================================
--- trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -420,7 +420,6 @@
$stream['last_granule_pos'] = $abs_granule_pos;
}
- $pageData = null;
return $page;
}
@@ -513,8 +512,8 @@
function getOverhead() {
$header_size = 0;
$stream_size = 0;
- foreach ($this->_streams as $serial => $stream) {
- foreach ($stream->_streamList as $offset => $stream_data) {
+ foreach ($this->_streams as $stream) {
+ foreach ($stream->_streamList as $stream_data) {
$header_size += $stream_data['body_offset'] -
$stream_data['head_offset'];
$stream_size = $stream_data['body_finish'];
}
Modified: trunk/extensions/Oversight/HideRevision_body.php
===================================================================
--- trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -101,7 +101,7 @@
// Hidden fields
$this->revisionFields() .
- Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
Xml::closeElement( 'form' ) );
}
Modified: trunk/extensions/ProofreadPage/ProofreadPage_body.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -343,7 +343,7 @@
* Append javascript variables and code to the page.
*/
function beforePageDisplay( &$out ) {
- global $wgTitle, $wgJsMimeType, $wgScriptPath, $wgRequest,
$wgProofreadPageVersion;
+ global $wgTitle, $wgRequest;
$action = $wgRequest->getVal( 'action' );
$isEdit = ( $action == 'submit' || $action == 'edit' ) ? 1 : 0;
@@ -662,8 +662,6 @@
* @todo FIXME: display whether page has been proofread by the user or
by someone else
*/
function pageQuality( $input, $args, $parser ) {
- global $wgUser;
-
$page_namespace = $this->page_namespace;
if ( !preg_match( "/^$page_namespace:(.*?)(\/([0-9]*)|)$/",
$parser->Title()->getPrefixedText() ) ) {
return '';
@@ -685,8 +683,6 @@
* Display a list of coloured links to pages
*/
function renderPageList( $input, $args, $parser ) {
- global $wgUser;
-
$page_namespace = $this->page_namespace;
$index_namespace = $this->index_namespace;
if ( !preg_match( "/^$index_namespace:(.*?)(\/([0-9]*)|)$/",
$parser->Title()->getPrefixedText(), $m ) ) {
@@ -1463,9 +1459,7 @@
}
$dbr = wfGetDB( DB_SLAVE );
- $pr_index = $dbr->tableName( 'pr_index' );
$page = $dbr->tableName( 'page' );
- $pagelinks = $dbr->tableName( 'pagelinks' );
$templatelinks = $dbr->tableName( 'templatelinks' );
$catlinks = $dbr->tableName( 'categorylinks' );
@@ -1552,7 +1546,6 @@
return true;
}
- $indexlink = '';
if( $indextitle ) {
$sk = $wgUser->getSkin();
$nt = Title::makeTitleSafe( $index_ns_index,
$indextitle );
Modified: trunk/extensions/Quiz/Quiz.class.php
===================================================================
--- trunk/extensions/Quiz/Quiz.class.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/Quiz/Quiz.class.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -21,7 +21,7 @@
* Constructor
*/
public function __construct( $argv, &$parser ) {
- global $wgRequest, $wgLanguageCode;
+ global $wgRequest;
$this->mParser = $parser;
$this->mRequest = &$wgRequest;
# Allot a unique identifier to the quiz.
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -240,7 +240,7 @@
'<sup>('.wfMsgHtml('ratinghistory-ave',$wgLang->formatNum($ave)).')</sup></td>';
}
$html .= '</tr><tr>';
- foreach( $votes as $tag => $dist ) {
+ foreach( $votes as $dist ) {
$html .= '<td><table>';
$html .= '<tr><th
align="left">'.wfMsgHtml('ratinghistory-table-rating').'</th>';
for( $i = 1; $i <= 5; $i++ ) {
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -31,7 +31,6 @@
}
public static function injectJSVars( &$globalVars ) {
- global $wgUser;
$globalVars['wgFeedbackParams'] =
ReaderFeedback::getJSFeedbackParams();
$globalVars['wgAjaxFeedback'] = (object) array(
'sendingMsg' => wfMsgHtml('readerfeedback-submitting'),
@@ -44,12 +43,12 @@
* Add ReaderFeedback css for relevant special pages.
*/
public static function InjectStyleForSpecial() {
- global $wgTitle, $wgOut, $wgUser;
+ global $wgTitle, $wgOut;
if( empty($wgTitle) || $wgTitle->getNamespace() !== NS_SPECIAL
) {
return true;
}
$spPages = array( 'RatingHistory' );
- foreach( $spPages as $n => $key ) {
+ foreach( $spPages as $key ) {
if( $wgTitle->isSpecial( $key ) ) {
global $wgScriptPath, $wgFeedbackStylePath,
$wgFeedbacktyleVersion;
$stylePath = str_replace( '$wgScriptPath',
$wgScriptPath, $wgFeedbackStylePath );
@@ -107,7 +106,7 @@
* @param Title $title
*/
protected static function addQuickFeedback( &$data, $top = false,
$title ) {
- global $wgOut, $wgUser, $wgRequest, $wgFeedbackTags;
+ global $wgOut, $wgUser, $wgFeedbackTags;
# Are there any reader input tags?
if( empty($wgFeedbackTags) ) {
return false;
@@ -128,7 +127,6 @@
$form .= Xml::openElement( 'span', array('id' =>
'mw-feedbackselects') );
# Loop through all different flag types
foreach( ReaderFeedback::getFeedbackTags() as $quality =>
$levels ) {
- $label = array();
$selected = ( isset($flags[$quality]) &&
$flags[$quality] > 0 ) ? $flags[$quality] : -1;
$form .= "<b>" . Xml::label(
wfMsgHtml("readerfeedback-$quality"), "wp$quality" ) . ":</b>";
$attribs = array( 'name' => "wp$quality", 'id' =>
"wp$quality",
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -141,7 +141,7 @@
$wgHooks['LoadExtensionSchemaUpdates'][] = 'efReaderFeedbackSchemaUpdates';
function efReaderFeedbackSchemaUpdates() {
- global $wgDBtype, $wgExtNewFields, $wgExtPGNewFields, $wgExtNewIndexes,
$wgExtNewTables;
+ global $wgDBtype, $wgExtNewTables;
$base = dirname(__FILE__);
if( $wgDBtype == 'mysql' ) {
$wgExtNewTables[] = array( 'reader_feedback',
"$base/ReaderFeedback.sql" ); // Initial install tables
Modified: trunk/extensions/ReaderFeedback/phplot-5.0.5/phplot.php
===================================================================
--- trunk/extensions/ReaderFeedback/phplot-5.0.5/phplot.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ReaderFeedback/phplot-5.0.5/phplot.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -2102,7 +2102,7 @@
$this->num_data_rows = count($which_dv);
$this->total_records = 0; // Perform some useful
calculations.
$this->records_per_group = 1;
- for ($i = 0, $recs = 0; $i < $this->num_data_rows; $i++) {
+ for ($i = 0; $i < $this->num_data_rows; $i++) {
// Copy
$this->data[$i] = array_values($which_dv[$i]); // convert to
numerical indices.
@@ -3911,7 +3911,6 @@
$xpos = $this->plot_area[0] + $this->plot_area_width/2;
$ypos = $this->plot_area[1] + $this->plot_area_height/2;
$diameter = min($this->plot_area_width, $this->plot_area_height);
- $radius = $diameter/2;
// Get sum of each column? One pie slice per column
if ($this->data_type === 'text-data') {
@@ -3954,7 +3953,6 @@
for ($h = $this->shading; $h >= 0; $h--) {
$color_index = 0;
- $start_angle = 0;
$end_angle = 0;
foreach ($sumarr as $val) {
// For shaded pies: the last one (at the top of the "stack")
has a brighter color:
@@ -4029,7 +4027,7 @@
// Suppress duplicate X data labels in linepoints mode; let
DrawLinesError() do them.
$do_labels = ($this->plot_type != 'linepoints');
- for($row = 0, $cnt = 0; $row < $this->num_data_rows; $row++) {
+ for($row = 0; $row < $this->num_data_rows; $row++) {
$record = 1; // Skip record #0
(title)
$x_now = $this->data[$row][$record++]; // Read it, advance record
index
@@ -4389,7 +4387,7 @@
$start_lines = array_fill(0, $this->records_per_group, FALSE);
- for ($row = 0, $cnt = 0; $row < $this->num_data_rows; $row++) {
+ for ($row = 0; $row < $this->num_data_rows; $row++) {
$record = 1; // Skip record #0
(data label)
$x_now = $this->data[$row][$record++]; // Read X value,
advance record index
Modified: trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -113,7 +113,7 @@
$bot = false;
// Each ajax url argument is of the form param|val.
// This means that there is no ugly order dependance.
- foreach( $args as $x => $arg ) {
+ foreach( $args as $arg ) {
$set = explode('|',$arg,2);
if( count($set) != 2 ) {
return '<err#>' . wfMsg('formerror');
@@ -226,7 +226,6 @@
public static function userAlreadyVoted( $title, $revId = 0 ) {
global $wgUser;
static $stackDepth = 0;
- $userVoted = false;
# Use page_latest if $revId not given
$revId = $revId ? $revId : $title->getLatestRevID(
Title::GAID_FOR_UPDATE );
$rev = Revision::newFromTitle( $title, $revId );
@@ -325,7 +324,6 @@
$dbw->insert( 'reader_feedback_history', $insertRows,
__METHOD__, 'IGNORE' );
# Update aggregate data for this page over time...
$touched = $dbw->timestamp( $now );
- $overall = 0;
$insertRows = array();
foreach( $this->dims as $tag => $val ) {
if( $val < 0 ) continue; // don't store "unsure" votes
Modified: trunk/extensions/ReaderFeedback/svggraph/svgGraph.php
===================================================================
--- trunk/extensions/ReaderFeedback/svggraph/svgGraph.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/ReaderFeedback/svggraph/svgGraph.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -403,7 +403,7 @@
// find range of all y values
$allDataY = array();
- foreach ($this->dataY as $i => $dataY) $allDataY = array_merge($allDataY,
$dataY);
+ foreach ($this->dataY as $dataY) $allDataY = array_merge($allDataY,
$dataY);
$this->allDataY = $allDataY;
$data = $this->_findRange($allDataY, $this->minY, $this->maxY,
$this->resolutionY);
$this->dataMinY = $data['min'];
@@ -594,8 +594,6 @@
$this->svgPlot .= "<g
style='{$this->stylePolylineDefault}{$this->format[$whichDataSet]['style']}'>\n";
$this->svgPlot .= "<polyline $attributes ";
- $u = 0;
- $v = 0;
foreach ($this->dataX as $i => $x) {
$y = $this->dataY[$whichDataSet][$i];
$u = $this->deltaTicksX * ($i + $this->offsetGridlinesX);
@@ -604,8 +602,6 @@
$v = ($this->plotHeight - $v) - 1;
if ($i==0) $this->svgPlot .= "points='$u,$v";
else $this->svgPlot .= " $u,$v ";
- $oldU = $u;
- $oldV = $v;
}
$this->svgPlot .= "'/>\n</g>\n";
return TRUE;
@@ -630,8 +626,7 @@
$attributes = empty($this->format[$whichDataSet]['attributes']) ?
'' : $this->format[$whichDataSet]['attributes'];
$this->svgPlot .= "<g
style='{$this->styleLineDefault}{$this->format[$whichDataSet]['style']}'>\n";
- $u = 0;
- $v = 0;
+
foreach ($this->dataX as $i => $x) {
$y = $this->dataY[$whichDataSet][$i];
$u = $this->deltaTicksX * ($i + $this->offsetGridlinesX);
@@ -672,8 +667,7 @@
$this->svgPlot .= "<g
style='{$this->styleBarDefault}{$this->format[$whichDataSet]['style']}'>\n";
$barWidth = $this->format[$whichDataSet]['barWidth'] * $this->deltaTicksX;
$barOffset = $this->format[$whichDataSet]['barOffset'] * $barWidth;
- $u = 0;
- $v = 0;
+
foreach ($this->dataX as $i => $x) {
$y = $this->dataY[$whichDataSet][$i];
$u = $this->deltaTicksX * ($i + $this->offsetGridlinesX) - ($barWidth /
2) + $barOffset;
@@ -704,7 +698,7 @@
*/
function _findRange($data, $min, $max, $resolution) {
if (sizeof($data) == 0 ) return array('min' => 0, 'max' => 0);
- foreach ($data as $key => $value) {
+ foreach ($data as $value) {
if ($value=='none') continue;
if ($value > $max) $max = $value;
if ($value < $min) $min = $value;
Modified: trunk/extensions/SecurePoll/includes/main/Store.php
===================================================================
--- trunk/extensions/SecurePoll/includes/main/Store.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/SecurePoll/includes/main/Store.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -262,8 +262,8 @@
'*',
array( 'en_id' => $id ),
__METHOD__ );
- return $row
- ? $row->en_type
+ return $res
+ ? $res->en_type
: false;
}
}
@@ -515,7 +515,6 @@
$info = array( 'type' => $entityType );
$messages = array();
$properties = array();
- $children = array();
if ( $xr->isEmptyElement ) {
wfDebug( __METHOD__.": unexpected empty element\n" );
$xr->read();
Modified: trunk/extensions/TitleBlacklist/TitleBlacklist.list.php
===================================================================
--- trunk/extensions/TitleBlacklist/TitleBlacklist.list.php 2010-10-29
21:38:15 UTC (rev 75679)
+++ trunk/extensions/TitleBlacklist/TitleBlacklist.list.php 2010-10-29
21:55:29 UTC (rev 75680)
@@ -318,7 +318,6 @@
*/
public static function newFromString( $line ) {
$raw = $line; // Keep line for raw data
- $regex = "";
$options = array();
// Strip comments
$line = preg_replace( "/^\\s*([^#]*)\\s*((.*)?)$/", "\\1",
$line );
Modified: trunk/extensions/TitleKey/TitleKey_body.php
===================================================================
--- trunk/extensions/TitleKey/TitleKey_body.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/TitleKey/TitleKey_body.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -64,7 +64,6 @@
// Hook functions....
static function updateDeleteSetup( $article, $user, $reason ) {
- global $tkDeleteIds;
$title = $article->mTitle->getPrefixedText();
self::$deleteIds[$title] = $article->getID();
return true;
Modified: trunk/extensions/UniversalEditButton/UniversalEditButton.php
===================================================================
--- trunk/extensions/UniversalEditButton/UniversalEditButton.php
2010-10-29 21:38:15 UTC (rev 75679)
+++ trunk/extensions/UniversalEditButton/UniversalEditButton.php
2010-10-29 21:55:29 UTC (rev 75680)
@@ -41,7 +41,7 @@
$wgExtensionMessagesFiles['UniversalEditButton'] = dirname(__FILE__) .
'/UniversalEditButton.i18n.php';
function efUniversalEditLink( $output ) {
- global $wgArticle, $wgTitle, $wgUser;
+ global $wgArticle, $wgTitle;
if( isset( $wgArticle ) &&
isset( $wgTitle ) &&
($wgTitle->quickUserCan( 'edit' )
Modified: trunk/extensions/intersection/DynamicPageList.php
===================================================================
--- trunk/extensions/intersection/DynamicPageList.php 2010-10-29 21:38:15 UTC
(rev 75679)
+++ trunk/extensions/intersection/DynamicPageList.php 2010-10-29 21:55:29 UTC
(rev 75680)
@@ -52,7 +52,6 @@
$wgExtensionMessagesFiles['DynamicPageList'] = $dir .
'DynamicPageList.i18n.php';
function wfDynamicPageList( &$parser ) {
- wfLoadExtensionMessages( 'DynamicPageList' );
$parser->setHook( "DynamicPageList", "DynamicPageList" );
return true;
}
@@ -66,7 +65,6 @@
global $wgDLPmaxCategories, $wgDLPMaxResultCount;
global $wgDLPAllowUnlimitedResults, $wgDLPAllowUnlimitedCategories;
- $aParams = array();
$bCountSet = false;
$sStartList = '<ul>';
@@ -543,7 +541,7 @@
//process results of query, outputing equivalent of
<li>[[Article]]</li> for each result,
//or something similar if the list uses other startlist/endlist
$articleList = Array();
- while ($row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$title = Title::makeTitle( $row->page_namespace,
$row->page_title);
if ( true == $bAddFirstCategoryDate ) {
if ( $sDateFormat != '' ) {
Modified: trunk/extensions/wikihiero/wh_main.php
===================================================================
--- trunk/extensions/wikihiero/wh_main.php 2010-10-29 21:38:15 UTC (rev
75679)
+++ trunk/extensions/wikihiero/wh_main.php 2010-10-29 21:55:29 UTC (rev
75680)
@@ -598,7 +598,6 @@
// return >> a string to add to the stream
//------------------------------------------------------------------------
function WH_RenderGlyph($glyph, $option='') {
- global $wh_mode;
global $wh_phonemes;
global $wh_files;
global $wh_scale;
@@ -775,7 +774,6 @@
$parenthesis = 0;
$type = WH_TYPE_NONE;
$is_cartouche = false;
- $is_striped = false;
for($char=0; $char<strlen($hiero); $char++) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
