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 "Hard deprecate Language::setCode"
[lhc/web/wiklou.git]
/
maintenance
/
userDupes.inc
diff --git
a/maintenance/userDupes.inc
b/maintenance/userDupes.inc
index
9893342
..
257c6be
100644
(file)
--- a/
maintenance/userDupes.inc
+++ b/
maintenance/userDupes.inc
@@
-163,7
+163,7
@@
class UserDupes {
/**
* We don't want anybody to mess with our stuff...
/**
* We don't want anybody to mess with our stuff...
- * @
access
private
+ * @private
*/
function lock() {
$set = [ 'user', 'revision' ];
*/
function lock() {
$set = [ 'user', 'revision' ];
@@
-178,7
+178,7
@@
class UserDupes {
}
/**
}
/**
- * @
access
private
+ * @private
*/
function unlock() {
$this->db->query( "UNLOCK TABLES", __METHOD__ );
*/
function unlock() {
$this->db->query( "UNLOCK TABLES", __METHOD__ );
@@
-187,7
+187,7
@@
class UserDupes {
/**
* Grab usernames for which multiple records are present in the database.
* @return array
/**
* Grab usernames for which multiple records are present in the database.
* @return array
- * @
access
private
+ * @private
*/
function getDupes() {
$user = $this->db->tableName( 'user' );
*/
function getDupes() {
$user = $this->db->tableName( 'user' );
@@
-195,7
+195,7
@@
class UserDupes {
"SELECT user_name,COUNT(*) AS n
FROM $user
GROUP BY user_name
"SELECT user_name,COUNT(*) AS n
FROM $user
GROUP BY user_name
- HAVING n > 1", __METHOD__ );
+
HAVING n > 1", __METHOD__ );
$list = [];
foreach ( $result as $row ) {
$list = [];
foreach ( $result as $row ) {
@@
-211,7
+211,7
@@
class UserDupes {
* for edits. If the dupes have no edits, we can safely remove them.
* @param string $name
* @param bool $doDelete
* for edits. If the dupes have no edits, we can safely remove them.
* @param string $name
* @param bool $doDelete
- * @
access
private
+ * @private
*/
function examine( $name, $doDelete ) {
$result = $this->db->select( 'user',
*/
function examine( $name, $doDelete ) {
$result = $this->db->select( 'user',
@@
-260,7
+260,7
@@
class UserDupes {
* where it might show up...
* @param int $userid
* @return int
* where it might show up...
* @param int $userid
* @return int
- * @
access
private
+ * @private
*/
function editCount( $userid ) {
return intval( $this->db->selectField(
*/
function editCount( $userid ) {
return intval( $this->db->selectField(
@@
-273,7
+273,7
@@
class UserDupes {
/**
* @param int $from
* @param int $to
/**
* @param int $from
* @param int $to
- * @
access
private
+ * @private
*/
function reassignEdits( $from, $to ) {
$this->out( 'reassigning... ' );
*/
function reassignEdits( $from, $to ) {
$this->out( 'reassigning... ' );
@@
-287,7
+287,7
@@
class UserDupes {
/**
* Remove a user account line.
* @param int $userid
/**
* Remove a user account line.
* @param int $userid
- * @
access
private
+ * @private
*/
function trimAccount( $userid ) {
$this->out( "deleting..." );
*/
function trimAccount( $userid ) {
$this->out( "deleting..." );