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 "tests: Complete test coverage of HtmlArmor"
[lhc/web/wiklou.git]
/
maintenance
/
migrateUserGroup.php
diff --git
a/maintenance/migrateUserGroup.php
b/maintenance/migrateUserGroup.php
index
ad82542
..
703d97f
100644
(file)
--- a/
maintenance/migrateUserGroup.php
+++ b/
maintenance/migrateUserGroup.php
@@
-48,7
+48,7
@@
class MigrateUserGroup extends Maintenance {
$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
[ 'ug_group' => $oldGroup ], __FUNCTION__ );
if ( $start === null ) {
$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
[ 'ug_group' => $oldGroup ], __FUNCTION__ );
if ( $start === null ) {
- $this->
error( "Nothing to do - no users in the '$oldGroup' group", true
);
+ $this->
fatalError( "Nothing to do - no users in the '$oldGroup' group"
);
}
# Do remaining chunk
$end += $batchSize - 1;
}
# Do remaining chunk
$end += $batchSize - 1;
@@
-63,7
+63,7
@@
class MigrateUserGroup extends Maintenance {
$dbw->update( 'user_groups',
[ 'ug_group' => $newGroup ],
[ 'ug_group' => $oldGroup,
$dbw->update( 'user_groups',
[ 'ug_group' => $newGroup ],
[ 'ug_group' => $oldGroup,
- "ug_user BETWEEN
$blockStart AND $blockEnd"
],
+ "ug_user BETWEEN
" . (int)$blockStart . " AND " . (int)$blockEnd
],
__METHOD__,
[ 'IGNORE' ]
);
__METHOD__,
[ 'IGNORE' ]
);
@@
-74,7
+74,7
@@
class MigrateUserGroup extends Maintenance {
// user/group is UNIQUE.
$dbw->delete( 'user_groups',
[ 'ug_group' => $oldGroup,
// user/group is UNIQUE.
$dbw->delete( 'user_groups',
[ 'ug_group' => $oldGroup,
- "ug_user BETWEEN
$blockStart AND $blockEnd"
],
+ "ug_user BETWEEN
" . (int)$blockStart . " AND " . (int)$blockEnd
],
__METHOD__
);
$affected += $dbw->affectedRows();
__METHOD__
);
$affected += $dbw->affectedRows();
@@
-86,7
+86,7
@@
class MigrateUserGroup extends Maintenance {
// were in the new group and not in the group.
$res = $dbw->select( 'user_groups', 'ug_user',
[ 'ug_group' => $newGroup,
// were in the new group and not in the group.
$res = $dbw->select( 'user_groups', 'ug_user',
[ 'ug_group' => $newGroup,
- "ug_user BETWEEN
$blockStart AND $blockEnd"
],
+ "ug_user BETWEEN
" . (int)$blockStart . " AND " . (int)$blockEnd
],
__METHOD__
);
if ( $res !== false ) {
__METHOD__
);
if ( $res !== false ) {