| Index: trunk/phase3/maintenance/runJobs.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | $this->addOption( 'type', 'Type of job to run', false, true ); |
| 36 | 36 | $this->addOption( 'procs', 'Number of processes to use', false, true ); |
| 37 | 37 | } |
| 38 | | - |
| | 38 | + |
| 39 | 39 | public function memoryLimit() { |
| 40 | 40 | // Don't eat all memory on the machine if we get a bad job. |
| 41 | 41 | return "150M"; |
| — | — | @@ -67,10 +67,10 @@ |
| 68 | 68 | $job = ($type == false) ? |
| 69 | 69 | Job::pop($offset) |
| 70 | 70 | : Job::pop_type($type); |
| 71 | | - |
| | 71 | + |
| 72 | 72 | if ($job == false) |
| 73 | 73 | break; |
| 74 | | - |
| | 74 | + |
| 75 | 75 | wfWaitForSlaves( 5 ); |
| 76 | 76 | $t = microtime( true ); |
| 77 | 77 | $offset=$job->id; |
| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | $removegroup[] = $group; |
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | | - |
| | 168 | + |
| 169 | 169 | $this->doSaveUserGroups( $user, $addgroup, $removegroup, $reason ); |
| 170 | 170 | } |
| 171 | 171 | |
| — | — | @@ -282,7 +282,7 @@ |
| 283 | 283 | $database = ''; |
| 284 | 284 | } else { |
| 285 | 285 | list( $name, $database ) = array_map( 'trim', $parts ); |
| 286 | | - |
| | 286 | + |
| 287 | 287 | if( $database == wfWikiID() ) { |
| 288 | 288 | $database = ''; |
| 289 | 289 | } else { |
| — | — | @@ -526,7 +526,7 @@ |
| 527 | 527 | $attr = $checkbox['disabled'] ? array( 'disabled' => 'disabled' ) : array(); |
| 528 | 528 | |
| 529 | 529 | if ( $checkbox['irreversible'] ) { |
| 530 | | - $text = htmlspecialchars( wfMsg( 'userrights-irreversible-marker', |
| | 530 | + $text = htmlspecialchars( wfMsg( 'userrights-irreversible-marker', |
| 531 | 531 | User::getGroupMember( $group ) ) ); |
| 532 | 532 | } else { |
| 533 | 533 | $text = htmlspecialchars( User::getGroupMember( $group ) ); |