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 way of including all stderr output when executing command"
[lhc/web/wiklou.git]
/
includes
/
User.php
diff --git
a/includes/User.php
b/includes/User.php
index
74d1e1f
..
12912e1
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-1489,12
+1489,13
@@
class User {
* last-hit counters will be shared across wikis.
*
* @param string $action Action to enforce; 'edit' if unspecified
* last-hit counters will be shared across wikis.
*
* @param string $action Action to enforce; 'edit' if unspecified
+ * @param integer $incrBy Positive amount to increment counter by [defaults to 1]
* @return bool True if a rate limiter was tripped
*/
* @return bool True if a rate limiter was tripped
*/
- public function pingLimiter( $action = 'edit' ) {
+ public function pingLimiter( $action = 'edit'
, $incrBy = 1
) {
// Call the 'PingLimiter' hook
$result = false;
// Call the 'PingLimiter' hook
$result = false;
- if ( !wfRunHooks( 'PingLimiter', array( &$this, $action, &$result ) ) ) {
+ if ( !wfRunHooks( 'PingLimiter', array( &$this, $action, &$result
, $incrBy
) ) ) {
return $result;
}
return $result;
}
@@
-1583,9
+1584,13
@@
class User {
}
} else {
wfDebug( __METHOD__ . ": adding record for $key $summary\n" );
}
} else {
wfDebug( __METHOD__ . ": adding record for $key $summary\n" );
- $wgMemc->add( $key, 0, intval( $period ) ); // first ping
+ if ( $incrBy > 0 ) {
+ $wgMemc->add( $key, 0, intval( $period ) ); // first ping
+ }
+ }
+ if ( $incrBy > 0 ) {
+ $wgMemc->incr( $key, $incrBy );
}
}
- $wgMemc->incr( $key );
}
wfProfileOut( __METHOD__ );
}
wfProfileOut( __METHOD__ );
@@
-1700,6
+1705,7
@@
class User {
return $this->mLocked;
}
global $wgAuth;
return $this->mLocked;
}
global $wgAuth;
+ StubObject::unstub( $wgAuth );
$authUser = $wgAuth->getUserInstance( $this );
$this->mLocked = (bool)$authUser->isLocked();
return $this->mLocked;
$authUser = $wgAuth->getUserInstance( $this );
$this->mLocked = (bool)$authUser->isLocked();
return $this->mLocked;
@@
-1717,6
+1723,7
@@
class User {
$this->getBlockedStatus();
if ( !$this->mHideName ) {
global $wgAuth;
$this->getBlockedStatus();
if ( !$this->mHideName ) {
global $wgAuth;
+ StubObject::unstub( $wgAuth );
$authUser = $wgAuth->getUserInstance( $this );
$this->mHideName = (bool)$authUser->isHidden();
}
$authUser = $wgAuth->getUserInstance( $this );
$this->mHideName = (bool)$authUser->isHidden();
}
@@
-2763,7
+2770,7
@@
class User {
$this->mEditCount = $count;
wfProfileOut( __METHOD__ );
}
$this->mEditCount = $count;
wfProfileOut( __METHOD__ );
}
- return (int)
$this->mEditCount;
+ return (int)$this->mEditCount;
}
/**
}
/**
@@
-4399,7
+4406,7
@@
class User {
// Pull from a slave to be less cruel to servers
// Accuracy isn't the point anyway here
$dbr = wfGetDB( DB_SLAVE );
// Pull from a slave to be less cruel to servers
// Accuracy isn't the point anyway here
$dbr = wfGetDB( DB_SLAVE );
- $count = (int)
$dbr->selectField(
+ $count = (int)$dbr->selectField(
'revision',
'COUNT(rev_user)',
array( 'rev_user' => $this->getId() ),
'revision',
'COUNT(rev_user)',
array( 'rev_user' => $this->getId() ),