dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add statsd metric support to WANObjectCache"
[lhc/web/wiklou.git]
/
includes
/
auth
/
AuthManager.php
diff --git
a/includes/auth/AuthManager.php
b/includes/auth/AuthManager.php
index
e9a6edc
..
9407c42
100644
(file)
--- a/
includes/auth/AuthManager.php
+++ b/
includes/auth/AuthManager.php
@@
-975,7
+975,7
@@
class AuthManager implements LoggerAwareInterface {
public function checkAccountCreatePermissions( User $creator ) {
// Wiki is read-only?
if ( wfReadOnly() ) {
public function checkAccountCreatePermissions( User $creator ) {
// Wiki is read-only?
if ( wfReadOnly() ) {
- return Status::newFatal(
'readonlytext', wfReadOnlyReason(
) );
+ return Status::newFatal(
wfMessage( 'readonlytext', wfReadOnlyReason()
) );
}
// This is awful, this permission check really shouldn't go through Title.
}
// This is awful, this permission check really shouldn't go through Title.
@@
-1579,7
+1579,7
@@
class AuthManager implements LoggerAwareInterface {
] );
$user->setId( 0 );
$user->loadFromId();
] );
$user->setId( 0 );
$user->loadFromId();
- return Status::newFatal(
'readonlytext', wfReadOnlyReason(
) );
+ return Status::newFatal(
wfMessage( 'readonlytext', wfReadOnlyReason()
) );
}
// Check the session, if we tried to create this user already there's
}
// Check the session, if we tried to create this user already there's
@@
-1660,7
+1660,7
@@
class AuthManager implements LoggerAwareInterface {
}
}
}
}
- $backoffKey =
wfMemc
Key( 'AuthManager', 'autocreate-failed', md5( $username ) );
+ $backoffKey =
$cache->make
Key( 'AuthManager', 'autocreate-failed', md5( $username ) );
if ( $cache->get( $backoffKey ) ) {
$this->logger->debug( __METHOD__ . ': {username} denied by prior creation attempt failures', [
'username' => $username,
if ( $cache->get( $backoffKey ) ) {
$this->logger->debug( __METHOD__ . ': {username} denied by prior creation attempt failures', [
'username' => $username,
@@
-2131,7
+2131,7
@@
class AuthManager implements LoggerAwareInterface {
* @param AuthenticationRequest[] &$reqs
* @param string $action
* @param string|null $username
* @param AuthenticationRequest[] &$reqs
* @param string $action
* @param string|null $username
- * @param bool
ean
$forceAction
+ * @param bool $forceAction
*/
private function fillRequests( array &$reqs, $action, $username, $forceAction = false ) {
foreach ( $reqs as $req ) {
*/
private function fillRequests( array &$reqs, $action, $username, $forceAction = false ) {
foreach ( $reqs as $req ) {