| Index: trunk/phase3/includes/diff/WikiDiff.php |
| — | — | @@ -313,7 +313,7 @@ |
| 314 | 314 | } |
| 315 | 315 | $matches = $ymatches[$line]; |
| 316 | 316 | reset($matches); |
| 317 | | - while ( list( $junk, $y ) = each( $matches ) ) { |
| | 317 | + while ( list( , $y ) = each( $matches ) ) { |
| 318 | 318 | if ( empty( $this->in_seq[$y] ) ) { |
| 319 | 319 | $k = $this->_lcs_pos( $y ); |
| 320 | 320 | assert( $k > 0 ); |
| — | — | @@ -321,7 +321,7 @@ |
| 322 | 322 | break; |
| 323 | 323 | } |
| 324 | 324 | } |
| 325 | | - while (list ( /* $junk */, $y) = each($matches)) { |
| | 325 | + while (list ( , $y) = each($matches)) { |
| 326 | 326 | if ($y > $this->seq[$k-1]) { |
| 327 | 327 | assert($y < $this->seq[$k]); |
| 328 | 328 | // Optimization: this is a common case: |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1473,7 +1473,6 @@ |
| 1474 | 1474 | global $wgOut; |
| 1475 | 1475 | |
| 1476 | 1476 | $oldid = $this->getOldID(); |
| 1477 | | - $useParserCache = $this->useParserCache( $oldid ); |
| 1478 | 1477 | $parserOptions = $this->getParserOptions(); |
| 1479 | 1478 | |
| 1480 | 1479 | # Render printable version, use printable version cache |
| Index: trunk/phase3/includes/parser/LinkHolderArray.php |
| — | — | @@ -159,7 +159,6 @@ |
| 160 | 160 | $current = null; |
| 161 | 161 | foreach ( $this->internals as $ns => $entries ) { |
| 162 | 162 | foreach ( $entries as $index => $entry ) { |
| 163 | | - $key = "$ns:$index"; |
| 164 | 163 | $title = $entry['title']; |
| 165 | 164 | $pdbk = $entry['pdbk']; |
| 166 | 165 | |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -1249,11 +1249,9 @@ |
| 1250 | 1250 | $join_conds ); |
| 1251 | 1251 | |
| 1252 | 1252 | // We must adjust for offset |
| 1253 | | - if ( isset( $options['LIMIT'] ) ) { |
| 1254 | | - if ( isset ( $options['OFFSET'] ) ) { |
| 1255 | | - $limit = $options['LIMIT']; |
| 1256 | | - $offset = $options['OFFSET']; |
| 1257 | | - } |
| | 1253 | + if ( isset( $options['LIMIT'] ) && isset ( $options['OFFSET'] ) ) { |
| | 1254 | + $limit = $options['LIMIT']; |
| | 1255 | + $offset = $options['OFFSET']; |
| 1258 | 1256 | } |
| 1259 | 1257 | |
| 1260 | 1258 | // DB2 does not have a proper num_rows() function yet, so we must emulate |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -552,9 +552,9 @@ |
| 553 | 553 | */ |
| 554 | 554 | function nextSequenceValue( $seqName ) { |
| 555 | 555 | if ( !$this->tableExists( 'sequence_' . $seqName ) ) { |
| 556 | | - $ret = sqlsrv_query( $this->mConn, "CREATE TABLE [sequence_$seqName] (id INT NOT NULL IDENTITY PRIMARY KEY, junk varchar(10) NULL)" ); |
| | 556 | + sqlsrv_query( $this->mConn, "CREATE TABLE [sequence_$seqName] (id INT NOT NULL IDENTITY PRIMARY KEY, junk varchar(10) NULL)" ); |
| 557 | 557 | } |
| 558 | | - $ret = sqlsrv_query( $this->mConn, "INSERT INTO [sequence_$seqName] (junk) VALUES ('')" ); |
| | 558 | + sqlsrv_query( $this->mConn, "INSERT INTO [sequence_$seqName] (junk) VALUES ('')" ); |
| 559 | 559 | $ret = sqlsrv_query( $this->mConn, "SELECT TOP 1 id FROM [sequence_$seqName] ORDER BY id DESC" ); |
| 560 | 560 | $row = sqlsrv_fetch_array( $ret, SQLSRV_FETCH_ASSOC );// KEEP ASSOC THERE, weird weird bug dealing with the return value if you don't |
| 561 | 561 | |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -563,11 +563,6 @@ |
| 564 | 564 | $nameWithTags = Sanitizer::normalizeCharReferences( Sanitizer::removeHTMLtags( $name ) ); |
| 565 | 565 | $this->mPagetitle = $nameWithTags; |
| 566 | 566 | |
| 567 | | - $taction = $this->getPageTitleActionText(); |
| 568 | | - if( !empty( $taction ) ) { |
| 569 | | - $name .= ' - '.$taction; |
| 570 | | - } |
| 571 | | - |
| 572 | 567 | # change "<i>foo&bar</i>" to "foo&bar" |
| 573 | 568 | $this->setHTMLTitle( wfMsg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) ) ); |
| 574 | 569 | } |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -355,7 +355,7 @@ |
| 356 | 356 | $prev_namespace = $row->cur_namespace; |
| 357 | 357 | } |
| 358 | 358 | $sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')'; |
| 359 | | - $rows = $this->db->query( $sql, __METHOD__ ); |
| | 359 | + $this->db->query( $sql, __METHOD__ ); |
| 360 | 360 | $this->output( wfTimestamp( TS_DB ) ); |
| 361 | 361 | $this->output( "......<b>Deleted</b> " . $this->db->affectedRows() . " records.\n" ); |
| 362 | 362 | } |
| Index: trunk/phase3/includes/installer/DatabaseInstaller.php |
| — | — | @@ -395,7 +395,6 @@ |
| 396 | 396 | * Set this to false to show a creation checkbox. |
| 397 | 397 | */ |
| 398 | 398 | public function getWebUserBox( $noCreateMsg = false ) { |
| 399 | | - $name = $this->getName(); |
| 400 | 399 | $s = Html::openElement( 'fieldset' ) . |
| 401 | 400 | Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) . |
| 402 | 401 | $this->getCheckBox( |
| Index: trunk/phase3/includes/installer/MysqlInstaller.php |
| — | — | @@ -366,7 +366,7 @@ |
| 367 | 367 | if ( !$create ) { |
| 368 | 368 | // Test the web account |
| 369 | 369 | try { |
| 370 | | - $webConn = new Database( |
| | 370 | + new Database( |
| 371 | 371 | $this->getVar( 'wgDBserver' ), |
| 372 | 372 | $this->getVar( 'wgDBuser' ), |
| 373 | 373 | $this->getVar( 'wgDBpassword' ), |
| Index: trunk/phase3/includes/installer/OracleInstaller.php |
| — | — | @@ -39,7 +39,6 @@ |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function getWebUserBox( $noCreateMsg = false ) { |
| 43 | | - $name = $this->getName(); |
| 44 | 43 | $this->parent->setVar( '_SameAccount', false ); |
| 45 | 44 | $this->parent->setVar( '_CreateDBAccount', true ); |
| 46 | 45 | $this->parent->setVar( 'wgDBname', '' ); |
| Index: trunk/phase3/includes/media/SVG.php |
| — | — | @@ -150,7 +150,6 @@ |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | function getMetadata( $file, $filename ) { |
| 154 | | - $metadata = array(); |
| 155 | 154 | try { |
| 156 | 155 | $metadata = SVGMetadataExtractor::getMetadata( $filename ); |
| 157 | 156 | } catch( Exception $e ) { |
| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -1055,7 +1055,7 @@ |
| 1056 | 1056 | # Extract fields from DB into the function scope (rc_xxxx variables) |
| 1057 | 1057 | // FIXME: Would be good to replace this extract() call with something |
| 1058 | 1058 | // that explicitly initializes variables. |
| 1059 | | - $classes = array(); // TODO implement |
| | 1059 | + // TODO implement |
| 1060 | 1060 | extract( $rcObj->mAttribs ); |
| 1061 | 1061 | $query['curid'] = $rc_cur_id; |
| 1062 | 1062 | |
| Index: trunk/phase3/includes/ConfEditor.php |
| — | — | @@ -536,7 +536,7 @@ |
| 537 | 537 | |
| 538 | 538 | switch ( $state ) { |
| 539 | 539 | case 'file': |
| 540 | | - $token = $this->expect( T_OPEN_TAG ); |
| | 540 | + $this->expect( T_OPEN_TAG ); |
| 541 | 541 | $token = $this->skipSpace(); |
| 542 | 542 | if ( $token->isEnd() ) { |
| 543 | 543 | break 2; |