http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65166
Revision: 65166 Author: mah Date: 2010-04-17 17:09:11 +0000 (Sat, 17 Apr 2010) Log Message: ----------- eol ws cleanup Modified Paths: -------------- trunk/phase3/includes/specials/SpecialUserrights.php trunk/phase3/maintenance/runJobs.php Modified: trunk/phase3/includes/specials/SpecialUserrights.php =================================================================== --- trunk/phase3/includes/specials/SpecialUserrights.php 2010-04-17 16:49:20 UTC (rev 65165) +++ trunk/phase3/includes/specials/SpecialUserrights.php 2010-04-17 17:09:11 UTC (rev 65166) @@ -164,7 +164,7 @@ $removegroup[] = $group; } } - + $this->doSaveUserGroups( $user, $addgroup, $removegroup, $reason ); } @@ -282,7 +282,7 @@ $database = ''; } else { list( $name, $database ) = array_map( 'trim', $parts ); - + if( $database == wfWikiID() ) { $database = ''; } else { @@ -526,7 +526,7 @@ $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 ) ); Modified: trunk/phase3/maintenance/runJobs.php =================================================================== --- trunk/phase3/maintenance/runJobs.php 2010-04-17 16:49:20 UTC (rev 65165) +++ trunk/phase3/maintenance/runJobs.php 2010-04-17 17:09:11 UTC (rev 65166) @@ -34,7 +34,7 @@ $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 @@ $job = ($type == false) ? Job::pop($offset) : Job::pop_type($type); - + if ($job == false) break; - + wfWaitForSlaves( 5 ); $t = microtime( true ); $offset=$job->id; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs