oops

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 5f0e2c2..4775713 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * See user.doc
+ * See user.txt
  *
  * @package MediaWiki
  */
@@ -252,7 +252,7 @@ class User {
         * And it's cheaper to check slave first, then master if needed, than master always.
         */
        function getBlockedStatus() {
-               global $wgIP, $wgBlockCache, $wgProxyList, $wgEnableSorbs;
+               global $wgIP, $wgBlockCache, $wgProxyList, $wgEnableSorbs, $bFromSlave;
 
                if ( -1 != $this->mBlockedby ) { return; }
 
@@ -296,8 +296,8 @@ class User {
                # DNSBL
                if ( !$this->mBlockedby && $wgEnableSorbs ) {
                        if ( $this->inSorbsBlacklist( $wgIP ) ) {
-                               $this->mBlockedBy = wfMsg( 'sorbs' );
-                               $this->mBlockereason = wfMsg( 'sorbsreason' );
+                               $this->mBlockedby = wfMsg( 'sorbs' );
+                               $this->mBlockreason = wfMsg( 'sorbsreason' );
                        }
                }
                        
@@ -1160,6 +1160,7 @@ class User {
                $confstr .= '!' . $this->getOption( 'date' );
                $confstr .= '!' . $this->getOption( 'numberheadings' );
                $confstr .= '!' . $this->getOption( 'language' );
+               $confstr .= '!' . $this->getOption( 'thumbsize' );
                // add in language specific options, if any
                $extra = $wgContLang->getExtraHashOptions();
                $confstr .= $extra;