| Index: trunk/phase3/maintenance/Maintenance.php |
| — | — | @@ -297,6 +297,9 @@ |
| 298 | 298 | return rtrim( $input ); |
| 299 | 299 | } |
| 300 | 300 | |
| | 301 | + /** |
| | 302 | + * @return bool |
| | 303 | + */ |
| 301 | 304 | public function isQuiet() { |
| 302 | 305 | return $this->mQuiet; |
| 303 | 306 | } |
| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -486,13 +486,13 @@ |
| 487 | 487 | $out .= ' ' . Xml::element( 'redirect', array( 'title' => self::canonicalTitle( $redirect ) ) ) . "\n"; |
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | | - |
| | 490 | + |
| 491 | 491 | if ( $row->rev_sha1 ) { |
| 492 | | - $out .= " " . Xml::element('sha1', null, strval($row->rev_sha1) ) . "\n"; |
| | 492 | + $out .= " " . Xml::element('sha1', null, strval( $row->rev_sha1 ) ) . "\n"; |
| 493 | 493 | } else { |
| 494 | 494 | $out .= " <sha1/>\n"; |
| 495 | 495 | } |
| 496 | | - |
| | 496 | + |
| 497 | 497 | if ( $row->page_restrictions != '' ) { |
| 498 | 498 | $out .= ' ' . Xml::element( 'restrictions', array(), |
| 499 | 499 | strval( $row->page_restrictions ) ) . "\n"; |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1019,7 +1019,7 @@ |
| 1020 | 1020 | return false; |
| 1021 | 1021 | |
| 1022 | 1022 | case self::AS_BLOCKED_PAGE_FOR_USER: |
| 1023 | | - throw new UserBlockedError( $wgUser->mBlock ); |
| | 1023 | + throw new UserBlockedError( $wgUser->getBlock() ); |
| 1024 | 1024 | |
| 1025 | 1025 | case self::AS_IMAGE_REDIRECT_ANON: |
| 1026 | 1026 | case self::AS_IMAGE_REDIRECT_LOGGED: |
| — | — | @@ -2959,7 +2959,7 @@ |
| 2960 | 2960 | wfDeprecated( __METHOD__, '1.19' ); |
| 2961 | 2961 | global $wgUser; |
| 2962 | 2962 | |
| 2963 | | - throw new UserBlockedError( $wgUser->mBlock ); |
| | 2963 | + throw new UserBlockedError( $wgUser->getBlock() ); |
| 2964 | 2964 | } |
| 2965 | 2965 | |
| 2966 | 2966 | /** |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1927,7 +1927,7 @@ |
| 1928 | 1928 | // Don't block the user from editing their own talk page unless they've been |
| 1929 | 1929 | // explicitly blocked from that too. |
| 1930 | 1930 | } elseif( $user->isBlocked() && $user->mBlock->prevents( $action ) !== false ) { |
| 1931 | | - $block = $user->mBlock; |
| | 1931 | + $block = $user->getBlock(); |
| 1932 | 1932 | |
| 1933 | 1933 | // This is from OutputPage::blockedPage |
| 1934 | 1934 | // Copied at r23888 by werdna |
| — | — | @@ -1947,15 +1947,15 @@ |
| 1948 | 1948 | |
| 1949 | 1949 | $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; |
| 1950 | 1950 | $blockid = $block->getId(); |
| 1951 | | - $blockExpiry = $user->mBlock->mExpiry; |
| 1952 | | - $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $user->mBlock->mTimestamp ), true ); |
| | 1951 | + $blockExpiry = $block->getExpiry(); |
| | 1952 | + $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $block->mTimestamp ), true ); |
| 1953 | 1953 | if ( $blockExpiry == 'infinity' ) { |
| 1954 | 1954 | $blockExpiry = wfMessage( 'infiniteblock' )->text(); |
| 1955 | 1955 | } else { |
| 1956 | 1956 | $blockExpiry = $wgLang->timeanddate( wfTimestamp( TS_MW, $blockExpiry ), true ); |
| 1957 | 1957 | } |
| 1958 | 1958 | |
| 1959 | | - $intended = strval( $user->mBlock->getTarget() ); |
| | 1959 | + $intended = strval( $block->getTarget() ); |
| 1960 | 1960 | |
| 1961 | 1961 | $errors[] = array( ( $block->mAuto ? 'autoblockedtext' : 'blockedtext' ), $link, $reason, $ip, $name, |
| 1962 | 1962 | $blockid, $blockExpiry, $intended, $blockTimestamp ); |
| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | * allow them to use Special:UserRights. |
| 74 | 74 | */ |
| 75 | 75 | if( $user->isBlocked() && !$user->isAllowed( 'userrights' ) ) { |
| 76 | | - throw new UserBlockedError( $user->mBlock ); |
| | 76 | + throw new UserBlockedError( $user->getBlock() ); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $request = $this->getRequest(); |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -157,7 +157,7 @@ |
| 158 | 158 | |
| 159 | 159 | # Check blocks |
| 160 | 160 | if( $user->isBlocked() ) { |
| 161 | | - throw new UserBlockedError( $user->mBlock ); |
| | 161 | + throw new UserBlockedError( $user->getBlock() ); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | # Check whether we actually want to allow changing stuff |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -84,9 +84,9 @@ |
| 85 | 85 | // Already set, no problem |
| 86 | 86 | continue; |
| 87 | 87 | } elseif ( !is_null( $prefFromUser ) && // Make sure we're not just pulling nothing |
| 88 | | - $field->validate( $prefFromUser, $user->mOptions ) === true ) { |
| | 88 | + $field->validate( $prefFromUser, $user->getOptions() ) === true ) { |
| 89 | 89 | $info['default'] = $prefFromUser; |
| 90 | | - } elseif ( $field->validate( $globalDefault, $user->mOptions ) === true ) { |
| | 90 | + } elseif ( $field->validate( $globalDefault, $user->getOptions() ) === true ) { |
| 91 | 91 | $info['default'] = $globalDefault; |
| 92 | 92 | } else { |
| 93 | 93 | throw new MWException( "Global default '$globalDefault' is invalid for field $name" ); |
| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -891,7 +891,7 @@ |
| 892 | 892 | $this->checkPermissions(); |
| 893 | 893 | |
| 894 | 894 | if ( $this->requiresUnblock() && $user->isBlocked() ) { |
| 895 | | - $block = $user->mBlock; |
| | 895 | + $block = $user->getBlock(); |
| 896 | 896 | throw new UserBlockedError( $block ); |
| 897 | 897 | } |
| 898 | 898 | |
| Index: trunk/phase3/includes/Action.php |
| — | — | @@ -277,7 +277,7 @@ |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | if ( $this->requiresUnblock() && $user->isBlocked() ) { |
| 281 | | - $block = $user->mBlock; |
| | 281 | + $block = $user->getBlock(); |
| 282 | 282 | throw new UserBlockedError( $block ); |
| 283 | 283 | } |
| 284 | 284 | |
| Index: trunk/phase3/includes/AjaxResponse.php |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | $timestamp = wfTimestamp( TS_MW, $timestamp ); |
| 167 | | - $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched, $wgCacheEpoch ) ); |
| | 167 | + $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->getTouched(), $wgCacheEpoch ) ); |
| 168 | 168 | |
| 169 | 169 | if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) { |
| 170 | 170 | # IE sends sizes after the date like this: |
| — | — | @@ -181,11 +181,11 @@ |
| 182 | 182 | $this->disable(); |
| 183 | 183 | $this->mLastModified = $lastmod; |
| 184 | 184 | |
| 185 | | - wfDebug( "$fname: CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); |
| | 185 | + wfDebug( "$fname: CACHED client: $ismodsince ; user: $wgUser->getTouched() ; page: $timestamp ; site $wgCacheEpoch\n", false ); |
| 186 | 186 | |
| 187 | 187 | return true; |
| 188 | 188 | } else { |
| 189 | | - wfDebug( "$fname: READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); |
| | 189 | + wfDebug( "$fname: READY client: $ismodsince ; user: $wgUser->getTouched() ; page: $timestamp ; site $wgCacheEpoch\n", false ); |
| 190 | 190 | $this->mLastModified = $lastmod; |
| 191 | 191 | } |
| 192 | 192 | } else { |