| Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -493,7 +493,7 @@ |
| 494 | 494 | * @return bool |
| 495 | 495 | */ |
| 496 | 496 | public function beforePageDisplayHTML( &$out, &$text ) { |
| 497 | | - global $wgContLang, $wgRequest, $wgMemc, $wgUser, $wgConf; |
| | 497 | + global $wgContLang, $wgRequest, $wgMemc, $wgUser; |
| 498 | 498 | wfProfileIn( __METHOD__ ); |
| 499 | 499 | |
| 500 | 500 | // Note: The WebRequest Class calls are made in this block because |
| — | — | @@ -679,14 +679,6 @@ |
| 680 | 680 | $this->checkUserStatus(); |
| 681 | 681 | $this->checkUserLoggedIn(); |
| 682 | 682 | |
| 683 | | - $DB = wfGetDB( DB_MASTER ); |
| 684 | | - $DBName = $DB->getDBname(); |
| 685 | | - |
| 686 | | - list( $site, $lang ) = $wgConf->siteFromDB( $DBName ); |
| 687 | | - if ( $site == 'wikipedia' && self::$code === 'en' ) { |
| 688 | | - self::$displayNoticeId = 2; |
| 689 | | - } |
| 690 | | - |
| 691 | 683 | if ( self::$title->isSpecial( 'Userlogin' ) && self::$isBetaGroupMember ) { |
| 692 | 684 | self::$wsLoginToken = $wgRequest->getSessionData( 'wsLoginToken' ); |
| 693 | 685 | $q = array( 'action' => 'submitlogin', 'type' => 'login' ); |