| Index: trunk/phase3/maintenance/parserTests.inc |
| — | — | @@ -1259,7 +1259,6 @@ |
| 1260 | 1260 | * and all that fun stuff |
| 1261 | 1261 | */ |
| 1262 | 1262 | function start() { |
| 1263 | | - global $wgDBtype; |
| 1264 | 1263 | parent::start(); |
| 1265 | 1264 | |
| 1266 | 1265 | if ( ! $this->db->tableExists( 'testrun' ) |
| Index: trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache, |
| 18 | 18 | $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc, |
| 19 | 19 | $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo, |
| 20 | | - $wgNamespacesWithSubpages, $wgThumbnailScriptPath, $wgScriptPath, |
| | 20 | + $wgThumbnailScriptPath, $wgScriptPath, |
| 21 | 21 | $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath; |
| 22 | 22 | |
| 23 | 23 | $wgScript = '/index.php'; |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | $messageMemc =& wfGetMessageCacheStorage(); |
| 47 | 47 | $parserMemc =& wfGetParserCacheStorage(); |
| 48 | 48 | |
| 49 | | - $wgContLang = new StubContLang; |
| | 49 | + //$wgContLang = new StubContLang; |
| 50 | 50 | $wgUser = new StubUser; |
| 51 | 51 | $wgLang = new StubUserLang; |
| 52 | 52 | $wgOut = new StubObject( 'wgOut', 'OutputPage' ); |
| Index: trunk/phase3/maintenance/tests/TimeAdjustTest.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | |
| 19 | 19 | # Test offset usage for a given language::userAdjust |
| 20 | 20 | function testUserAdjust() { |
| 21 | | - global $wgLocalTZoffset, $wgContLang, $wgUser; |
| | 21 | + global $wgLocalTZoffset, $wgContLang; |
| 22 | 22 | |
| 23 | 23 | $wgContLang = $en = Language::factory( 'en' ); |
| 24 | 24 | |
| Index: trunk/phase3/maintenance/tests/SearchDbTest.php |
| — | — | @@ -3,7 +3,6 @@ |
| 4 | 4 | var $db; |
| 5 | 5 | |
| 6 | 6 | function setUp() { |
| 7 | | - global $wgDBprefix, $wgDBtype; |
| 8 | 7 | $this->db = wfGetDB( DB_MASTER ); |
| 9 | 8 | if ( !$this->db ) { |
| 10 | 9 | $this->markTestIncomplete( "Can't find a database to test with." ); |
| Index: trunk/phase3/maintenance/tests/ApiSetup.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | protected static $apiUrl; |
| 9 | 9 | |
| 10 | 10 | function setup() { |
| 11 | | - global $wgServerName, $wgServer, $wgContLang, $wgAuth, $wgScriptPath, |
| | 11 | + global $wgServer, $wgContLang, $wgAuth, $wgScriptPath, |
| 12 | 12 | $wgScriptExtension, $wgMemc, $wgRequest; |
| 13 | 13 | |
| 14 | 14 | self::$apiUrl = $wgServer . $wgScriptPath . "/api" . $wgScriptExtension; |
| Index: trunk/phase3/maintenance/tests/TitlePermissionTest.php |
| — | — | @@ -10,7 +10,7 @@ |
| 11 | 11 | static $altUserName; |
| 12 | 12 | |
| 13 | 13 | function setUp() { |
| 14 | | - global $wgAutoloadLocalClasses, $wgLocaltimezone, $wgLocalTZoffset; |
| | 14 | + global $wgLocaltimezone, $wgLocalTZoffset; |
| 15 | 15 | self::$userName = "Useruser"; |
| 16 | 16 | self::$altUserName = "Altuseruser"; |
| 17 | 17 | date_default_timezone_set( $wgLocaltimezone ); |
| — | — | @@ -40,7 +40,6 @@ |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | function setUserPerm( $perm ) { |
| 44 | | - global $wgUseRCPatrol, $wgUseNPPatrol; |
| 45 | 44 | if ( is_array( $perm ) ) { |
| 46 | 45 | self::$user->mRights = $perm; |
| 47 | 46 | } else { |
| Index: trunk/phase3/maintenance/tests/selenium/Selenium.php |
| — | — | @@ -21,7 +21,6 @@ |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function start() { |
| 25 | | - global $wgSeleniumTestsBrowsers, $wgSeleniumTestsSeleniumHost; |
| 26 | 25 | parent::start(); |
| 27 | 26 | $this->isStarted = true; |
| 28 | 27 | } |
| Index: trunk/phase3/maintenance/tests/UploadFromUrlTest.php |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | class UploadFromUrlTest extends ApiTestSetup { |
| 10 | 10 | |
| 11 | 11 | function setUp() { |
| 12 | | - global $wgEnableUploads, $wgLocalFileRepo, $wgAllowCopyUploads; |
| | 12 | + global $wgEnableUploads, $wgAllowCopyUploads; |
| 13 | 13 | |
| 14 | 14 | $wgEnableUploads = true; |
| 15 | 15 | $wgAllowCopyUploads = true; |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2375,7 +2375,6 @@ |
| 2376 | 2376 | $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges'; |
| 2377 | 2377 | $return = SpecialPage::getTitleFor( $returnto ); |
| 2378 | 2378 | |
| 2379 | | - $dbw = wfGetDB( DB_MASTER ); |
| 2380 | 2379 | $errors = $rc->doMarkPatrolled(); |
| 2381 | 2380 | |
| 2382 | 2381 | if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) { |
| Index: trunk/phase3/includes/parser/Parser_LinkHooks.php |
| — | — | @@ -128,7 +128,6 @@ |
| 129 | 129 | $titleRegex = "/^([{$tc}]+)$/sD"; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | | - $sk = $this->mOptions->getSkin(); |
| 133 | 132 | $holders = new LinkHolderArray( $this ); |
| 134 | 133 | |
| 135 | 134 | if( is_null( $this->mTitle ) ) { |
| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -32,7 +32,6 @@ |
| 33 | 33 | private $stmt; |
| 34 | 34 | private $nrows; |
| 35 | 35 | |
| 36 | | - private $unique; |
| 37 | 36 | private function array_unique_md( $array_in ) { |
| 38 | 37 | $array_out = array(); |
| 39 | 38 | $array_hashes = array(); |
| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -6,10 +6,6 @@ |
| 7 | 7 | * @since 1.17 |
| 8 | 8 | */ |
| 9 | 9 | class CliInstaller extends CoreInstaller { |
| 10 | | - |
| 11 | | - /* The maintenance class in effect */ |
| 12 | | - private $maint; |
| 13 | | - |
| 14 | 10 | private $optionMap = array( |
| 15 | 11 | 'dbtype' => 'wgDBtype', |
| 16 | 12 | 'dbserver' => 'wgDBserver', |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -846,7 +846,6 @@ |
| 847 | 847 | class WebInstaller_Complete extends WebInstallerPage { |
| 848 | 848 | |
| 849 | 849 | public function execute() { |
| 850 | | - global $IP; |
| 851 | 850 | $this->startForm(); |
| 852 | 851 | $this->addHTML( |
| 853 | 852 | $this->parent->getInfoBox( |
| Index: trunk/phase3/includes/WebRequest.php |
| — | — | @@ -777,7 +777,6 @@ |
| 778 | 778 | class FauxRequest extends WebRequest { |
| 779 | 779 | private $wasPosted = false; |
| 780 | 780 | private $session = array(); |
| 781 | | - private $response; |
| 782 | 781 | |
| 783 | 782 | /** |
| 784 | 783 | * @param $data Array of *non*-urlencoded key => value pairs, the |
| Index: trunk/phase3/includes/media/PNG.php |
| — | — | @@ -50,8 +50,7 @@ |
| 51 | 51 | return (boolean) $data; |
| 52 | 52 | } |
| 53 | 53 | function getLongDesc( $image ) { |
| 54 | | - global $wgUser, $wgLang; |
| 55 | | - $sk = $wgUser->getSkin(); |
| | 54 | + global $wgLang; |
| 56 | 55 | $original = parent::getLongDesc( $image ); |
| 57 | 56 | |
| 58 | 57 | wfSuppressWarnings(); |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -27,7 +27,6 @@ |
| 28 | 28 | /** @name Static cache variables */ |
| 29 | 29 | // @{ |
| 30 | 30 | static private $titleCache = array(); |
| 31 | | - static private $interwikiCache = array(); |
| 32 | 31 | // @} |
| 33 | 32 | |
| 34 | 33 | /** |
| — | — | @@ -3487,7 +3486,6 @@ |
| 3488 | 3487 | * @return \type{\bool} TRUE or FALSE |
| 3489 | 3488 | */ |
| 3490 | 3489 | public function isValidMoveTarget( $nt ) { |
| 3491 | | - $dbw = wfGetDB( DB_MASTER ); |
| 3492 | 3490 | # Is it an existing file? |
| 3493 | 3491 | if ( $nt->getNamespace() == NS_FILE ) { |
| 3494 | 3492 | $file = wfLocalFile( $nt ); |
| Index: trunk/phase3/includes/extauth/vB.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | * @ingroup ExternalUser |
| 38 | 38 | */ |
| 39 | 39 | class ExternalUser_vB extends ExternalUser { |
| 40 | | - private $mDb, $mRow; |
| | 40 | + private $mRow; |
| 41 | 41 | |
| 42 | 42 | protected function initFromName( $name ) { |
| 43 | 43 | return $this->initFromCond( array( 'username' => $name ) ); |