| Index: trunk/phase3/maintenance/deleteBatch.php |
| — | — | @@ -81,7 +81,6 @@ |
| 82 | 82 | continue; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | | - |
| 86 | 85 | $this->output( $page->getPrefixedText() ); |
| 87 | 86 | $dbw->begin(); |
| 88 | 87 | if ( $page->getNamespace() == NS_FILE ) { |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -241,7 +241,7 @@ |
| 242 | 242 | $i = $this->getRandomNonLagged( $currentLoads, $wiki ); |
| 243 | 243 | if ( $i === false && count( $currentLoads ) != 0 ) { |
| 244 | 244 | # All slaves lagged. Switch to read-only mode |
| 245 | | - wfDebugLog( 'replication', 'All slaves lagged. Switch to read-only mode' ); |
| | 245 | + wfDebugLog( 'replication', "All slaves lagged. Switch to read-only mode\n" ); |
| 246 | 246 | $wgReadOnly = wfMessage( 'readonly_lag' )->useDatabase( false )->plain(); |
| 247 | 247 | $i = $this->pickRandom( $currentLoads ); |
| 248 | 248 | $laggedSlaveMode = true; |
| Index: trunk/phase3/includes/media/Generic.php |
| — | — | @@ -495,9 +495,16 @@ |
| 496 | 496 | $thumbstat = stat( $dstPath ); |
| 497 | 497 | if( $thumbstat['size'] == 0 || $retval != 0 ) { |
| 498 | 498 | $result = unlink( $dstPath ); |
| 499 | | - wfDebugLog( 'thumbnail', |
| 500 | | - sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() result: %d', |
| 501 | | - $thumbstat['size'], $dstPath, $result ) ); |
| | 499 | + |
| | 500 | + if ( $result ) { |
| | 501 | + wfDebugLog( 'thumbnail', |
| | 502 | + sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() succeeded', |
| | 503 | + $thumbstat['size'], $dstPath ) ); |
| | 504 | + } else { |
| | 505 | + wfDebugLog( 'thumbnail', |
| | 506 | + sprintf( 'Removing bad %d-byte thumbnail "%s". unlink() failed', |
| | 507 | + $thumbstat['size'], $dstPath ) ); |
| | 508 | + } |
| 502 | 509 | return true; |
| 503 | 510 | } |
| 504 | 511 | } |