| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -4629,7 +4629,6 @@ |
| 4630 | 4630 | } |
| 4631 | 4631 | |
| 4632 | 4632 | # Get the file |
| 4633 | | - $imagename = $title->getDBkey(); |
| 4634 | 4633 | $file = wfFindFile( $title, array( 'time' => $time ) ); |
| 4635 | 4634 | # Get parameter map |
| 4636 | 4635 | $handler = $file ? $file->getHandler() : false; |
| — | — | @@ -5132,10 +5131,6 @@ |
| 5133 | 5132 | return $text; |
| 5134 | 5133 | } |
| 5135 | 5134 | |
| 5136 | | - function srvus( $text ) { |
| 5137 | | - return $this->testSrvus( $text, $this->mOutputType ); |
| 5138 | | - } |
| 5139 | | - |
| 5140 | 5135 | /** |
| 5141 | 5136 | * strip/replaceVariables/unstrip for preprocessor regression testing |
| 5142 | 5137 | */ |
| Index: trunk/phase3/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -612,7 +612,7 @@ |
| 613 | 613 | # do we still qualify for any callback with remaining count? |
| 614 | 614 | $names = $rules[$piece->open]['names']; |
| 615 | 615 | $skippedBraces = 0; |
| 616 | | - $enclosingAccum =& $accum; |
| | 616 | + |
| 617 | 617 | while ( $piece->count ) { |
| 618 | 618 | if ( array_key_exists( $piece->count, $names ) ) { |
| 619 | 619 | $stack->push( $piece ); |
| — | — | @@ -622,7 +622,6 @@ |
| 623 | 623 | --$piece->count; |
| 624 | 624 | $skippedBraces ++; |
| 625 | 625 | } |
| 626 | | - $enclosingAccum .= str_repeat( $piece->open, $skippedBraces ); |
| 627 | 626 | } |
| 628 | 627 | $flags = $stack->getFlags(); |
| 629 | 628 | extract( $flags ); |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -359,7 +359,9 @@ |
| 360 | 360 | function normaliseSpecialPage( Title $title ) { |
| 361 | 361 | if ( $title->getNamespace() == NS_SPECIAL ) { |
| 362 | 362 | list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() ); |
| 363 | | - if ( !$name ) return $title; |
| | 363 | + if ( !$name ) { |
| | 364 | + return $title; |
| | 365 | + } |
| 364 | 366 | $ret = SpecialPage::getTitleFor( $name, $subpage ); |
| 365 | 367 | $ret->mFragment = $title->getFragment(); |
| 366 | 368 | return $ret; |
| — | — | @@ -1911,7 +1913,6 @@ |
| 1912 | 1914 | if( $text === '' ) { |
| 1913 | 1915 | $text = $this->linkText( $title ); |
| 1914 | 1916 | } |
| 1915 | | - $nt = $this->normaliseSpecialPage( $title ); |
| 1916 | 1917 | |
| 1917 | 1918 | $ret = $this->link( $title, "$prefix$text$inside", array(), |
| 1918 | 1919 | wfCgiToArray( $query ), 'broken' ) . $trail; |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -814,7 +814,7 @@ |
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | function setup_database() { |
| 818 | | - global $wgVersion, $wgDBmwschema, $wgDBport, $wgDBuser; |
| | 818 | + global $wgVersion, $wgDBport, $wgDBuser; |
| 819 | 819 | |
| 820 | 820 | // Make sure that we can write to the correct schema |
| 821 | 821 | $ctest = "mediawiki_test_table"; |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -3186,7 +3186,6 @@ |
| 3187 | 3187 | wfDebug( __METHOD__ . "\n" ); |
| 3188 | 3188 | |
| 3189 | 3189 | $dbw = wfGetDB( DB_MASTER ); |
| 3190 | | - $ns = $this->mTitle->getNamespace(); |
| 3191 | 3190 | $t = $this->mTitle->getDBkey(); |
| 3192 | 3191 | $id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE ); |
| 3193 | 3192 | |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -622,7 +622,6 @@ |
| 623 | 623 | $info['url'] |
| 624 | 624 | ); |
| 625 | 625 | |
| 626 | | - $pathRelativeToRepo = substr( $info['url'], strlen( $info['repo-url'] ) ); |
| 627 | 626 | $viewvc .= '/?pathrev='; |
| 628 | 627 | $viewvc .= urlencode( $info['checkout-rev'] ); |
| 629 | 628 | $info['viewvc-url'] = $viewvc; |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -1143,7 +1143,6 @@ |
| 1144 | 1144 | if( $haveRevisions ) { |
| 1145 | 1145 | # The page's stored (deleted) history: |
| 1146 | 1146 | $wgOut->addHTML("<ul>"); |
| 1147 | | - $target = urlencode( $this->mTarget ); |
| 1148 | 1147 | $remaining = $revisions->numRows(); |
| 1149 | 1148 | $earliestLiveTime = $this->mTargetObj->getEarliestRevTime(); |
| 1150 | 1149 | |
| — | — | @@ -1263,7 +1262,6 @@ |
| 1264 | 1263 | if( $this->mAllowed && $row->fa_storage_key ) { |
| 1265 | 1264 | $checkBox = Xml::check( "fileid" . $row->fa_id ); |
| 1266 | 1265 | $key = urlencode( $row->fa_storage_key ); |
| 1267 | | - $target = urlencode( $this->mTarget ); |
| 1268 | 1266 | $pageLink = $this->getFileLink( $file, $this->getTitle(), $ts, $key, $sk ); |
| 1269 | 1267 | } else { |
| 1270 | 1268 | $checkBox = ''; |
| Index: trunk/phase3/includes/RevisionDelete.php |
| — | — | @@ -1212,7 +1212,6 @@ |
| 1213 | 1213 | ' (' . |
| 1214 | 1214 | wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $this->file->getSize() ) ) . |
| 1215 | 1215 | ')'; |
| 1216 | | - $pageLink = $this->getLink(); |
| 1217 | 1216 | |
| 1218 | 1217 | return '<li>' . $this->getLink() . ' ' . $this->getUserTools() . ' ' . |
| 1219 | 1218 | $data . ' ' . $this->getComment(). '</li>'; |
| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -610,8 +610,6 @@ |
| 611 | 611 | |
| 612 | 612 | $text = wfMsgReal( $msg, $args, false, false, false ); |
| 613 | 613 | $html = $this->parse( $text, true ); |
| 614 | | - $id = $this->helpId++; |
| 615 | | - $alt = wfMsg( 'help' ); |
| 616 | 614 | |
| 617 | 615 | return |
| 618 | 616 | "<div class=\"config-help-wrapper\">\n" . |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1614,7 +1614,6 @@ |
| 1615 | 1615 | } |
| 1616 | 1616 | } else { |
| 1617 | 1617 | if ( $this->isMultibyte( $str ) ) { |
| 1618 | | - list( $wikiUpperChars ) = $this->getCaseMaps(); |
| 1619 | 1618 | $x = $first ? '^' : ''; |
| 1620 | 1619 | return preg_replace_callback( |
| 1621 | 1620 | "/$x([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/", |
| — | — | @@ -1654,7 +1653,6 @@ |
| 1655 | 1654 | } |
| 1656 | 1655 | } else { |
| 1657 | 1656 | if ( $this->isMultibyte( $str ) ) { |
| 1658 | | - list( , $wikiLowerChars ) = self::getCaseMaps(); |
| 1659 | 1657 | $x = $first ? '^' : ''; |
| 1660 | 1658 | return preg_replace_callback( |
| 1661 | 1659 | "/$x([A-Z]|[\\xc0-\\xff][\\x80-\\xbf]*)/", |
| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -1209,7 +1209,7 @@ |
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | 1212 | function do_postgres_updates() { |
| 1213 | | - global $wgDatabase, $wgDBmwschema, $wgDBts2schema, $wgShowExceptionDetails, $wgDBuser; |
| | 1213 | + global $wgDatabase, $wgDBmwschema, $wgDBts2schema, $wgDBuser; |
| 1214 | 1214 | |
| 1215 | 1215 | # # Gather version numbers in case we need them |
| 1216 | 1216 | $version = $wgDatabase->getServerVersion(); # # long string |