From: Mark A. Hershberger Date: Sat, 17 Apr 2010 17:09:11 +0000 (+0000) Subject: eol ws cleanup X-Git-Tag: 1.31.0-rc.0~37080 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=990214534d15f9a0cf2e694f5a29f041f4457627;p=lhc%2Fweb%2Fwiklou.git eol ws cleanup --- diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index 38de0d3012..1c58548c48 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -164,7 +164,7 @@ class UserrightsPage extends SpecialPage { $removegroup[] = $group; } } - + $this->doSaveUserGroups( $user, $addgroup, $removegroup, $reason ); } @@ -282,7 +282,7 @@ class UserrightsPage extends SpecialPage { $database = ''; } else { list( $name, $database ) = array_map( 'trim', $parts ); - + if( $database == wfWikiID() ) { $database = ''; } else { @@ -526,7 +526,7 @@ class UserrightsPage extends SpecialPage { $attr = $checkbox['disabled'] ? array( 'disabled' => 'disabled' ) : array(); if ( $checkbox['irreversible'] ) { - $text = htmlspecialchars( wfMsg( 'userrights-irreversible-marker', + $text = htmlspecialchars( wfMsg( 'userrights-irreversible-marker', User::getGroupMember( $group ) ) ); } else { $text = htmlspecialchars( User::getGroupMember( $group ) ); diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index e03bf5d163..ead4205f5e 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -34,7 +34,7 @@ class RunJobs extends Maintenance { $this->addOption( 'type', 'Type of job to run', false, true ); $this->addOption( 'procs', 'Number of processes to use', false, true ); } - + public function memoryLimit() { // Don't eat all memory on the machine if we get a bad job. return "150M"; @@ -67,10 +67,10 @@ class RunJobs extends Maintenance { $job = ($type == false) ? Job::pop($offset) : Job::pop_type($type); - + if ($job == false) break; - + wfWaitForSlaves( 5 ); $t = microtime( true ); $offset=$job->id;