summaryrefslogtreecommitdiff
path: root/includes/User.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/User.php')
-rw-r--r--includes/User.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/User.php b/includes/User.php
index a584f39d..cebcf604 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -115,7 +115,6 @@ class User {
'deletedhistory',
'deletedtext',
'deleterevision',
- 'disableaccount',
'edit',
'editinterface',
'editusercssjs', #deprecated
@@ -2939,7 +2938,7 @@ class User {
return false;
}
- return (bool)$userblock->doAutoblock( $this->getRequest()->getIP() );
+ return (bool)$userblock->doAutoblock( wfGetIP() );
}
/**