| Index: trunk/extensions/Renameuser/Renameuser_body.php |
| — | — | @@ -455,6 +455,14 @@ |
| 456 | 456 | __METHOD__ |
| 457 | 457 | ); |
| 458 | 458 | } |
| | 459 | + |
| | 460 | + // Increase time limit (like CheckUser); this can take a while... |
| | 461 | + if ( $this->tablesJob ) { |
| | 462 | + wfSuppressWarnings(); |
| | 463 | + set_time_limit( 120 ); |
| | 464 | + wfRestoreWarnings(); |
| | 465 | + } |
| | 466 | + |
| 459 | 467 | // Construct jobqueue updates... |
| 460 | 468 | // FIXME: if a bureaucrat renames a user in error, he/she |
| 461 | 469 | // must be careful to wait until the rename finishes before |
| — | — | @@ -531,12 +539,16 @@ |
| 532 | 540 | $jobRows = 0; |
| 533 | 541 | } |
| 534 | 542 | } |
| | 543 | + // FIXME: this commits per 50 rows, so when this times out |
| | 544 | + // (which id does) the DB will be in a half-assed state... |
| 535 | 545 | Job::batchInsert( $jobs ); |
| 536 | 546 | } |
| 537 | 547 | $dbw->freeResult( $res ); |
| 538 | 548 | } |
| 539 | 549 | |
| 540 | 550 | // Commit the transaction |
| | 551 | + // FIXME: this line is misleading and nearly totally |
| | 552 | + // useless if the jobqueue was used for any of the tables... |
| 541 | 553 | $dbw->commit(); |
| 542 | 554 | |
| 543 | 555 | // Delete from memcached again to make sure |
| Index: trunk/extensions/Renameuser/Renameuser.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | * The maximum number of edits a user can have and still be allowed renaming, |
| 33 | 33 | * set it to 0 to disable the limit. |
| 34 | 34 | */ |
| 35 | | -define( 'RENAMEUSER_CONTRIBLIMIT', 1000000 ); |
| | 35 | +define( 'RENAMEUSER_CONTRIBLIMIT', 25000 ); |
| 36 | 36 | define( 'RENAMEUSER_CONTRIBJOB', 5000 ); |
| 37 | 37 | |
| 38 | 38 | # Add a new log type |