| Index: trunk/phase3/maintenance/orphans.php |
| — | — | @@ -168,7 +168,7 @@ |
| 169 | 169 | $text = $dbw->tableName( 'text' ); |
| 170 | 170 | |
| 171 | 171 | if ( $fix ) { |
| 172 | | - $dbw->lockTables( $dbw, 'text' ); |
| | 172 | + $dbw->lockTables( $dbw, 'text', __METHOD__ ); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | $this->output( "\nChecking for pages whose page_latest links are incorrect... (this may take a while on a large wiki)\n" ); |
| Index: trunk/phase3/includes/ProfilerSimple.php |
| — | — | @@ -109,8 +109,9 @@ |
| 110 | 110 | |
| 111 | 111 | function getCpuTime($ru=null) { |
| 112 | 112 | if ( function_exists( 'getrusage' ) ) { |
| 113 | | - if ( $ru == null ) |
| | 113 | + if ( $ru == null ) { |
| 114 | 114 | $ru = getrusage(); |
| | 115 | + } |
| 115 | 116 | return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] + |
| 116 | 117 | $ru['ru_stime.tv_usec']) * 1e-6); |
| 117 | 118 | } else { |
| — | — | @@ -120,8 +121,9 @@ |
| 121 | 122 | |
| 122 | 123 | /* If argument is passed, it assumes that it is dual-format time string, returns proper float time value */ |
| 123 | 124 | function getTime($time=null) { |
| 124 | | - if ($time==null) |
| | 125 | + if ($time==null) { |
| 125 | 126 | return microtime(true); |
| | 127 | + } |
| 126 | 128 | list($a,$b)=explode(" ",$time); |
| 127 | 129 | return (float)($a+$b); |
| 128 | 130 | } |