Index: trunk/extensions/GlobalUsage/SpecialGlobalUsage.php |
— | — | @@ -105,7 +105,6 @@ |
106 | 106 | return; |
107 | 107 | } |
108 | 108 | |
109 | | - $offset = $query->getOffsetString(); |
110 | 109 | $navbar = $this->getNavBar( $query ); |
111 | 110 | $targetName = $this->target->getText(); |
112 | 111 | |
Index: trunk/extensions/CodeReview/ui/CodeStatusChangeListView.php |
— | — | @@ -62,7 +62,6 @@ |
63 | 63 | } |
64 | 64 | |
65 | 65 | function formatValue( $name, $value ) { |
66 | | - global $wgLang; |
67 | 66 | switch( $name ) { |
68 | 67 | case 'cpc_rev_id': |
69 | 68 | return $this->mView->mSkin->link( |
Index: trunk/extensions/CentralNotice/SpecialBannerAllocation.php |
— | — | @@ -128,7 +128,7 @@ |
129 | 129 | * Show a list of banners with allocation. Newer banners are shown first. |
130 | 130 | */ |
131 | 131 | function showList() { |
132 | | - global $wgRequest, $wgOut, $wgUser, $wgRequest, $wgLang; |
| 132 | + global $wgOut, $wgUser, $wgRequest, $wgLang; |
133 | 133 | |
134 | 134 | $sk = $wgUser->getSkin(); |
135 | 135 | $viewPage = $this->getTitleFor( 'NoticeTemplate', 'view' ); |
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php |
— | — | @@ -149,8 +149,6 @@ |
150 | 150 | if ($row->gb_anon_only) |
151 | 151 | $options[] = wfMsg('globalblocking-list-anononly'); |
152 | 152 | |
153 | | - $titleObj = SpecialPage::getTitleFor( "GlobalBlockList" ); |
154 | | - |
155 | 153 | ## Do afterthoughts (comment, links for admins) |
156 | 154 | $info = array(); |
157 | 155 | |
Index: trunk/extensions/Gadgets/Gadgets.php |
— | — | @@ -137,7 +137,7 @@ |
138 | 138 | } else { |
139 | 139 | $destination = &$options; |
140 | 140 | } |
141 | | - foreach( $thisSection as $gname => $code ) { |
| 141 | + foreach( $thisSection as $gname ) { |
142 | 142 | $destination[wfMsgExt( "gadget-$gname", 'parseinline' )] = $gname; |
143 | 143 | } |
144 | 144 | } |
Index: trunk/extensions/APC/SpecialAPC.php |
— | — | @@ -100,7 +100,6 @@ |
101 | 101 | } |
102 | 102 | } |
103 | 103 | |
104 | | - $dir = dirname( __FILE__ ); |
105 | 104 | $wgOut->addLink( array( 'rel' => 'stylesheet', 'type' => 'text/css', |
106 | 105 | 'href' => "$wgScriptPath/extensions/APC/apc.css?$wgStyleVersion", ) |
107 | 106 | ); |
— | — | @@ -181,7 +180,7 @@ |
182 | 181 | } |
183 | 182 | |
184 | 183 | protected function doObHostStats() { |
185 | | - global $wgOut, $wgLang; |
| 184 | + global $wgOut; |
186 | 185 | |
187 | 186 | $mem = apc_sma_info(); |
188 | 187 | |
Index: trunk/extensions/ExtensionDistributor/ExtensionDistributor_body.php |
— | — | @@ -69,7 +69,7 @@ |
70 | 70 | |
71 | 71 | $this->extensionList = array(); |
72 | 72 | |
73 | | - foreach ( $wgExtDistBranches as $branchPath => $branch ) { |
| 73 | + foreach ( $wgExtDistBranches as $branchPath ) { |
74 | 74 | $wc = "$wgExtDistWorkingCopy/$branchPath/extensions"; |
75 | 75 | $dir = opendir( $wc ); |
76 | 76 | |
Index: trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php |
— | — | @@ -159,8 +159,7 @@ |
160 | 160 | (?:\|$pipeContents)* |
161 | 161 | \]\] |
162 | 162 | #six", array( $this, '_stripLink' ), $text ); |
163 | | - |
164 | | - $protocols = wfUrlProtocols(); |
| 163 | + |
165 | 164 | $text = preg_replace( '#\\[(?:$protocols).*? (.*?)\\]#s', '$1', $text ); // URL links |
166 | 165 | $text = preg_replace( '#</?[a-z0-9]+.*?>#s', '', $text ); // HTML-style tags |
167 | 166 | $text = preg_replace( '#\\{\\|.*?\\|\\}#s', '', $text ); // tables |
Index: trunk/extensions/FixedImage/FixedImage.php |
— | — | @@ -47,7 +47,7 @@ |
48 | 48 | |
49 | 49 | function fixedImageSetup( &$parser ) { |
50 | 50 | global $wgFixedImageHooks; |
51 | | - foreach( $wgFixedImageHooks as $key => $data ) { |
| 51 | + foreach( $wgFixedImageHooks as $key ) { |
52 | 52 | $wrapper = create_function( '$text, $params=null', |
53 | 53 | "return fixedImageHandler('$key', \$text, \$params);" ); |
54 | 54 | $parser->setHook( $key, $wrapper ); |
Index: trunk/extensions/PagedTiffHandler/TiffReader.php |
— | — | @@ -113,7 +113,6 @@ |
114 | 114 | |
115 | 115 | public function check( $debug = false ) { |
116 | 116 | $offset = $this->ifd_offsets[$this->embed_files]['offset']; |
117 | | - $rounds = 0; |
118 | 117 | // loop over all ifd |
119 | 118 | while ( $offset && $offset <= $this->real_eof ) { |
120 | 119 | // save the offset if it is the highest one |
Index: trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php |
— | — | @@ -25,7 +25,6 @@ |
26 | 26 | class PagedTiffHandlerTest extends PHPUnit_Framework_TestCase { |
27 | 27 | |
28 | 28 | private $handler; |
29 | | - private $image; |
30 | 29 | private $preCheckError = false; |
31 | 30 | |
32 | 31 | function upload( $title, $path ) { |
Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php |
— | — | @@ -60,11 +60,8 @@ |
61 | 61 | * - check for running-identify-service |
62 | 62 | */ |
63 | 63 | function verifyUpload( $fileName ) { |
64 | | - global $wgTiffMaxEmbedFiles, $wgTiffMaxMetaSize, $wgMaxUploadSize, |
65 | | - $wgTiffRejectOnError, $wgTiffRejectOnWarning, $wgTiffUseTiffReader, |
66 | | - $wgTiffReaderPath, $wgTiffReaderCheckEofForJS; |
| 64 | + global $wgTiffUseTiffReader, $wgTiffReaderCheckEofForJS; |
67 | 65 | |
68 | | - wfLoadExtensionMessages( 'PagedTiffHandler' ); |
69 | 66 | $status = Status::newGood(); |
70 | 67 | if ( $wgTiffUseTiffReader ) { |
71 | 68 | $tr = new TiffReader( $fileName ); |
— | — | @@ -382,6 +379,7 @@ |
383 | 380 | |
384 | 381 | wfProfileIn( 'PagedTiffHandler' ); |
385 | 382 | wfDebug( __METHOD__ . ": $cmd\n" ); |
| 383 | + $retval = null; |
386 | 384 | $err = wfShellExec( $cmd, $retval ); |
387 | 385 | wfProfileOut( 'PagedTiffHandler' ); |
388 | 386 | |
Index: trunk/extensions/SiteMatrix/SiteMatrix_body.php |
— | — | @@ -78,7 +78,7 @@ |
79 | 79 | uasort( $this->specials, array( __CLASS__, 'sortSpecial' ) ); |
80 | 80 | |
81 | 81 | if( $hideEmpty ){ |
82 | | - foreach( $xLanglist as $lang => $unused ){ |
| 82 | + foreach( $xLanglist as $lang ){ |
83 | 83 | $empty = true; |
84 | 84 | foreach ( $this->sites as $site ) { |
85 | 85 | if( !empty( $this->matrix[$site][$lang] ) ){ |
Index: trunk/extensions/ContributionReporting/FundraiserStatistics_body.php |
— | — | @@ -78,7 +78,7 @@ |
79 | 79 | |
80 | 80 | // Chart maximums |
81 | 81 | foreach ( $egFundraiserStatisticsFundraisers as $fundraiser ) { |
82 | | - foreach ( $charts as $name => $chart ) { |
| 82 | + foreach ( $charts as $name ) { |
83 | 83 | $chartMax = $this->query( $charts[$name]['query'], $fundraiser['start'], $fundraiser['end'] ); |
84 | 84 | if ( $chartMax > $charts[$name]['max'] ) { |
85 | 85 | $charts[$name]['max'] = $chartMax; |
— | — | @@ -161,7 +161,7 @@ |
162 | 162 | // Tabs |
163 | 163 | $first = true; |
164 | 164 | $htmlCharts = Xml::openElement( 'div', array( 'class' => 'fundraiserstats-chart-tabs' ) ); |
165 | | - foreach ( $charts as $chart => $columns ) { |
| 165 | + foreach ( $charts as $chart ) { |
166 | 166 | $htmlCharts .= Xml::tags( |
167 | 167 | 'div', |
168 | 168 | array( |
Index: trunk/extensions/CentralAuth/SpecialCentralAuth.php |
— | — | @@ -8,7 +8,7 @@ |
9 | 9 | } |
10 | 10 | |
11 | 11 | function execute( $subpage ) { |
12 | | - global $wgOut, $wgRequest, $wgUser; |
| 12 | + global $wgOut; |
13 | 13 | global $wgExtensionAssetsPath, $wgCentralAuthStyleVersion; |
14 | 14 | global $wgUser, $wgRequest; |
15 | 15 | $this->setHeaders(); |
Index: trunk/extensions/CentralAuth/SpecialMergeAccount.php |
— | — | @@ -6,7 +6,7 @@ |
7 | 7 | } |
8 | 8 | |
9 | 9 | function execute( $subpage ) { |
10 | | - global $wgOut, $wgRequest, $wgUser; |
| 10 | + global $wgOut, $wgUser; |
11 | 11 | $this->setHeaders(); |
12 | 12 | |
13 | 13 | if ( !$this->userCanExecute( $wgUser ) ) { |
Index: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php |
— | — | @@ -217,7 +217,7 @@ |
218 | 218 | if ( $iDims ) { |
219 | 219 | $this->dims = $iDims; |
220 | 220 | } else { |
221 | | - foreach ( FlaggedRevs::getDimensions() as $tag => $levels ) { |
| 221 | + foreach ( FlaggedRevs::getDimensions() as $tag ) { |
222 | 222 | if ( $this->dims[$tag] === 0 ) { |
223 | 223 | $this->unapprovedTags++; |
224 | 224 | } |
Index: trunk/extensions/FlaggedRevs/FRDependencyUpdate.php |
— | — | @@ -25,7 +25,7 @@ |
26 | 26 | # Get any links that are only in the stable version... |
27 | 27 | $cLinks = $this->getCurrentVersionLinks(); |
28 | 28 | foreach ( $this->sLinks as $ns => $titles ) { |
29 | | - foreach ( $titles as $title => $pageId ) { |
| 29 | + foreach ( $titles as $title ) { |
30 | 30 | if ( !isset( $cLinks[$ns][$title] ) ) { |
31 | 31 | self::addDependency( $deps, $ns, $title ); |
32 | 32 | } |
— | — | @@ -33,7 +33,7 @@ |
34 | 34 | } |
35 | 35 | # Get any images that are only in the stable version... |
36 | 36 | $cImages = $this->getCurrentVersionImages(); |
37 | | - foreach ( $this->sImages as $image => $n ) { |
| 37 | + foreach ( $this->sImages as $image ) { |
38 | 38 | if ( !isset( $cImages[$image] ) ) { |
39 | 39 | self::addDependency( $deps, NS_FILE, $image ); |
40 | 40 | } |
— | — | @@ -41,7 +41,7 @@ |
42 | 42 | # Get any templates that are only in the stable version... |
43 | 43 | $cTemplates = $this->getCurrentVersionTemplates(); |
44 | 44 | foreach ( $this->sTemplates as $ns => $titles ) { |
45 | | - foreach ( $titles as $title => $id ) { |
| 45 | + foreach ( $titles as $title ) { |
46 | 46 | if ( !isset( $cTemplates[$ns][$title] ) ) { |
47 | 47 | self::addDependency( $deps, $ns, $title ); |
48 | 48 | } |
— | — | @@ -49,7 +49,7 @@ |
50 | 50 | } |
51 | 51 | # Get any categories that are only in the stable version... |
52 | 52 | $cCategories = $this->getCurrentVersionCategories(); |
53 | | - foreach ( $this->sCategories as $category => $sort ) { |
| 53 | + foreach ( $this->sCategories as $category ) { |
54 | 54 | if ( !isset( $cCategories[$category] ) ) { |
55 | 55 | self::addDependency( $deps, NS_CATEGORY, $category ); |
56 | 56 | } |
— | — | @@ -108,7 +108,7 @@ |
109 | 109 | } else { |
110 | 110 | $diffs = $dbkeys; |
111 | 111 | } |
112 | | - foreach ( $diffs as $dbk => $id ) { |
| 112 | + foreach ( $diffs as $dbk ) { |
113 | 113 | $arr[] = array( |
114 | 114 | 'ftr_from' => $this->title->getArticleId(), |
115 | 115 | 'ftr_namespace' => $ns, |
— | — | @@ -125,7 +125,7 @@ |
126 | 126 | */ |
127 | 127 | protected function getDepDeletions( array $existing, array $new ) { |
128 | 128 | $del = array(); |
129 | | - foreach ( $existing as $ns => $dbkeys ) { |
| 129 | + foreach ( $existing as $ns ) { |
130 | 130 | if ( isset( $new[$ns] ) ) { |
131 | 131 | $del[$ns] = array_diff_key( $existing[$ns], $new[$ns] ); |
132 | 132 | } else { |
Index: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php |
— | — | @@ -57,7 +57,7 @@ |
58 | 58 | # Special token to discourage fiddling... |
59 | 59 | $form->setValidatedParams( $wgRequest->getVal( 'validatedParams' ) ); |
60 | 60 | # Tag values |
61 | | - foreach ( FlaggedRevs::getDimensions() as $tag => $levels ) { |
| 61 | + foreach ( FlaggedRevs::getDimensions() as $tag ) { |
62 | 62 | # This can be NULL if we uncheck a checkbox |
63 | 63 | $val = $wgRequest->getInt( "wp$tag" ); |
64 | 64 | $form->setDim( $tag, $val ); |
Index: trunk/extensions/FlaggedRevs/FlaggedRevsXML.php |
— | — | @@ -182,7 +182,7 @@ |
183 | 183 | if ( $prettyBox ) { |
184 | 184 | $tag .= "<table id='mw-fr-revisionratings-box' align='center' class='$css' cellpadding='0'>"; |
185 | 185 | } |
186 | | - foreach ( FlaggedRevs::getDimensions() as $quality => $x ) { |
| 186 | + foreach ( FlaggedRevs::getDimensions() as $quality ) { |
187 | 187 | $level = isset( $flags[$quality] ) ? $flags[$quality] : 0; |
188 | 188 | $encValueText = wfMsgHtml( "revreview-$quality-$level" ); |
189 | 189 | $level = $flags[$quality]; |
Index: trunk/extensions/FlaggedRevs/api/ApiReview.php |
— | — | @@ -62,7 +62,7 @@ |
63 | 63 | $form->setNotes( $params['notes'] ); |
64 | 64 | // The flagging parameters have the form 'flag_$name'. |
65 | 65 | // Extract them and put the values into $form->dims |
66 | | - foreach ( FlaggedRevs::getDimensions() as $tag => $levels ) { |
| 66 | + foreach ( FlaggedRevs::getDimensions() as $tag ) { |
67 | 67 | $form->setDim( $tag, intval( $params['flag_' . $tag] ) ); |
68 | 68 | } |
69 | 69 | if ( $form->isApproval() ) { |
— | — | @@ -174,7 +174,7 @@ |
175 | 175 | if ( FlaggedRevs::dimensionsEmpty() ) { |
176 | 176 | $desc['unapprove'] = "If set, revision will be unapproved rather than approved."; |
177 | 177 | } else { |
178 | | - foreach ( FlaggedRevs::getDimensions() as $flagname => $levels ) { |
| 178 | + foreach ( FlaggedRevs::getDimensions() as $flagname ) { |
179 | 179 | $desc['flag_' . $flagname] = "Set the flag ''{$flagname}'' to the specified value"; |
180 | 180 | } |
181 | 181 | } |
Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewTestBatch.php |
— | — | @@ -78,7 +78,8 @@ |
79 | 79 | function doTest() { |
80 | 80 | // Quick syntax check. |
81 | 81 | global $wgUser, $wgOut; |
82 | | - if ( ( $result = AbuseFilter::checkSyntax( $this->mFilter ) ) !== true ) { |
| 82 | + $result = AbuseFilter::checkSyntax( $this->mFilter ); |
| 83 | + if ( $result !== true ) { |
83 | 84 | $wgOut->addWikiMsg( 'abusefilter-test-syntaxerr' ); |
84 | 85 | return; |
85 | 86 | } |
Index: trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php |
— | — | @@ -133,7 +133,7 @@ |
134 | 134 | 'onchange' => "updateFeedbackForm()" ); |
135 | 135 | $form .= ' ' . Xml::openElement( 'select', $attribs ); |
136 | 136 | $levels = array_reverse($levels,true); |
137 | | - foreach( $levels as $i => $name ) { |
| 137 | + foreach( $levels as $i ) { |
138 | 138 | $optionClass = array( 'class' => "rfb-rating-option-$i" ); |
139 | 139 | $form .= Xml::option( wfMsg("readerfeedback-level-$i"), $i, ($i == $selected), $optionClass ) ."\n"; |
140 | 140 | } |
Index: trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php |
— | — | @@ -117,7 +117,7 @@ |
118 | 118 | $data = false; |
119 | 119 | $html = ''; |
120 | 120 | // Do each graphs for said time period |
121 | | - foreach( ReaderFeedback::getFeedbackTags() as $tag => $weight ) { |
| 121 | + foreach( ReaderFeedback::getFeedbackTags() as $tag ) { |
122 | 122 | // Check if cached version is available. |
123 | 123 | // If not, then generate a new one. |
124 | 124 | $filePath = $this->getFilePath( $tag ); |
Index: trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php |
— | — | @@ -54,7 +54,7 @@ |
55 | 55 | # Get our rating dimensions |
56 | 56 | $this->dims = array(); |
57 | 57 | $unsureCount = 0; |
58 | | - foreach( ReaderFeedback::getFeedbackTags() as $tag => $weight ) { |
| 58 | + foreach( ReaderFeedback::getFeedbackTags() as $tag ) { |
59 | 59 | $this->dims[$tag] = $wgRequest->getIntOrNull( "wp$tag" ); |
60 | 60 | if( $this->dims[$tag] === null ) { // nothing sent at all :( |
61 | 61 | $wgOut->redirect( $this->page->getLocalUrl() ); |
Index: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php |
— | — | @@ -204,7 +204,7 @@ |
205 | 205 | array( 'USE INDEX' => array('revision' => 'page_timestamp') ) |
206 | 206 | ); |
207 | 207 | $votes = array(); |
208 | | - foreach( ReaderFeedback::getFeedbackTags() as $tag => $w ) { |
| 208 | + foreach( ReaderFeedback::getFeedbackTags() as $tag ) { |
209 | 209 | $votes[$tag] = array( 0 => 0, 1 => 0, 2 => 0, 3 => 0, 4 => 0 ); |
210 | 210 | } |
211 | 211 | // Read votes and tally the numbers |
— | — | @@ -226,7 +226,7 @@ |
227 | 227 | } |
228 | 228 | // Output multi-column list |
229 | 229 | $html = "<table class='rfb-reader_feedback_table' cellspacing='0'><tr>"; |
230 | | - foreach( ReaderFeedback::getFeedbackTags() as $tag => $w ) { |
| 230 | + foreach( ReaderFeedback::getFeedbackTags() as $tag ) { |
231 | 231 | // Get tag average... |
232 | 232 | $dist = isset($votes[$tag]) ? $votes[$tag] : array(); |
233 | 233 | $count = array_sum($dist); |
Index: trunk/extensions/ReaderFeedback/ReaderFeedbackXML.php |
— | — | @@ -47,7 +47,7 @@ |
48 | 48 | public static function getTagMenu( $selected = '' ) { |
49 | 49 | $s = "<label for='wpRatingTag'>" . wfMsgHtml('readerfeedback-tagfilter') . "</label> "; |
50 | 50 | $s .= Xml::openElement( 'select', array('name' => 'ratingtag', 'id' => 'wpRatingTag') ); |
51 | | - foreach( ReaderFeedback::getFeedbackTags() as $tag => $weight ) { |
| 51 | + foreach( ReaderFeedback::getFeedbackTags() as $tag ) { |
52 | 52 | $s .= Xml::option( wfMsg( "readerfeedback-$tag" ), $tag, $selected===$tag ); |
53 | 53 | } |
54 | 54 | $s .= Xml::closeElement('select')."\n"; |
Index: trunk/extensions/SecurePoll/includes/talliers/SchulzeTallier.php |
— | — | @@ -93,7 +93,7 @@ |
94 | 94 | } |
95 | 95 | |
96 | 96 | # Now $winners is the list of candidates that tie for this position |
97 | | - foreach ( $winners as $oid => $unused ) { |
| 97 | + foreach ( $winners as $oid ) { |
98 | 98 | $ranks[$oid] = $currentRank; |
99 | 99 | } |
100 | 100 | $currentRank += count( $winners ); |
Index: trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php |
— | — | @@ -33,7 +33,7 @@ |
34 | 34 | // Show the results |
35 | 35 | $s = "<table class=\"securepoll-results\">\n"; |
36 | 36 | |
37 | | - foreach ( $this->tally as $oid => $rank ) { |
| 37 | + foreach ( $this->tally as $oid ) { |
38 | 38 | $option = $this->optionsById[$oid]; |
39 | 39 | $s .= '<tr><td>' . $option->parseMessageInline( 'text' ) . "</td>\n" . |
40 | 40 | '<td>' . $this->tally[$oid] . "</td>\n" . |
— | — | @@ -46,7 +46,7 @@ |
47 | 47 | function getTextResult() { |
48 | 48 | // Calculate column width |
49 | 49 | $width = 10; |
50 | | - foreach ( $this->tally as $oid => $rank ) { |
| 50 | + foreach ( $this->tally as $oid ) { |
51 | 51 | $option = $this->optionsById[$oid]; |
52 | 52 | $width = max( $width, strlen( $option->getMessage( 'text' ) ) ); |
53 | 53 | } |
— | — | @@ -60,7 +60,7 @@ |
61 | 61 | if ( $qtext !== '' ) { |
62 | 62 | $s .= wordwrap( $qtext ) . "\n"; |
63 | 63 | } |
64 | | - foreach ( $this->tally as $oid => $rank ) { |
| 64 | + foreach ( $this->tally as $oid ) { |
65 | 65 | $option = $this->optionsById[$oid]; |
66 | 66 | $otext = $option->getMessage( 'text' ); |
67 | 67 | if ( strlen( $otext ) > $width ) { |
Index: trunk/extensions/SecurePoll/includes/talliers/HistogramRangeTallier.php |
— | — | @@ -69,7 +69,7 @@ |
70 | 70 | Xml::tags( 'td', array( 'class' => 'securepoll-results-row-heading' ), |
71 | 71 | $optionLabels[$oid] ) . |
72 | 72 | "\n"; |
73 | | - foreach ( $labels as $score => $label ) { |
| 73 | + foreach ( $labels as $score ) { |
74 | 74 | $s .= Xml::element( 'td', array(), $this->histogram[$oid][$score] ) . "\n"; |
75 | 75 | } |
76 | 76 | $s .= Xml::element( 'td', array(), $average ) . "\n"; |
Index: trunk/extensions/SecurePoll/includes/entities/Entity.php |
— | — | @@ -148,7 +148,6 @@ |
149 | 149 | * @param $name string |
150 | 150 | */ |
151 | 151 | function getMessage( $name ) { |
152 | | - $id = $this->getId(); |
153 | 152 | foreach ( $this->context->languages as $language ) { |
154 | 153 | if ( empty( $this->messagesLoaded[$language] ) ) { |
155 | 154 | $this->loadMessages( $language ); |
Index: trunk/extensions/SecurePoll/includes/main/Context.php |
— | — | @@ -197,7 +197,7 @@ |
198 | 198 | if ( isset( $this->messagesLoaded[$lang] ) ) { |
199 | 199 | $cacheRow = $this->messagesLoaded[$lang]; |
200 | 200 | $uncachedIds = array_flip( $ids ); |
201 | | - foreach ( $uncachedIds as $id => $unused ) { |
| 201 | + foreach ( $uncachedIds as $id ) { |
202 | 202 | if ( isset( $cacheRow[$id] ) ) { |
203 | 203 | unset( $uncachedIds[$id] ); |
204 | 204 | } |
Index: trunk/extensions/DynamicPageList/DPLMain.php |
— | — | @@ -105,8 +105,6 @@ |
106 | 106 | $_sOffset = $wgRequest->getVal( 'DPL_offset', ExtDynamicPageList::$options['offset']['default'] ); |
107 | 107 | $iOffset = ( $_sOffset == '' ) ? 0: intval( $_sOffset ); |
108 | 108 | |
109 | | - $iCount = - 1; |
110 | | - |
111 | 109 | // commandline parameters like %DPL_offset% are replaced |
112 | 110 | $input = self::resolveUrlArg( $input, 'DPL_offset' ); |
113 | 111 | $input = self::resolveUrlArg( $input, 'DPL_count' ); |