| Index: branches/wmf/1.19wmf1/includes/Setup.php |
| — | — | @@ -361,7 +361,10 @@ |
| 362 | 362 | $wgCookieSecure = ( substr( $wgServer, 0, 6 ) === 'https:' ); |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | | -if ( $wgDebugToolbar ) { |
| | 365 | +// Disable MWDebug for command line mode, this prevents MWDebug from eating up |
| | 366 | +// all the memory from logging SQL queries on maintenance scripts |
| | 367 | +global $wgCommandLineMode; |
| | 368 | +if ( $wgDebugToolbar && !$wgCommandLineMode ) { |
| 366 | 369 | MWDebug::init(); |
| 367 | 370 | } |
| 368 | 371 | |
| — | — | @@ -410,7 +413,6 @@ |
| 411 | 414 | } |
| 412 | 415 | |
| 413 | 416 | # Useful debug output |
| 414 | | -global $wgCommandLineMode; |
| 415 | 417 | if ( $wgCommandLineMode ) { |
| 416 | 418 | $wgRequest = new FauxRequest( array() ); |
| 417 | 419 | |
| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -792,7 +792,11 @@ |
| 793 | 793 | */ |
| 794 | 794 | protected function logException( Exception $e, $func, array $params ) { |
| 795 | 795 | wfDebugLog( 'SwiftBackend', |
| 796 | | - get_class( $e ) . " in '{$this->name}': '{$func}' with " . serialize( $params ) |
| | 796 | + get_class( $e ) . " in '{$func}' (given '" . serialize( $params ) . "')" . |
| | 797 | + ( $e instanceof InvalidResponseException |
| | 798 | + ? ": {$e->getMessage()}" |
| | 799 | + : "" |
| | 800 | + ) |
| 797 | 801 | ); |
| 798 | 802 | } |
| 799 | 803 | } |
| Index: branches/wmf/1.19wmf1/includes/EditPage.php |
| — | — | @@ -1453,13 +1453,13 @@ |
| 1454 | 1454 | global $wgUser; |
| 1455 | 1455 | if ( $this->watchthis xor $this->mTitle->userIsWatching() ) { |
| 1456 | 1456 | $dbw = wfGetDB( DB_MASTER ); |
| 1457 | | - $dbw->begin(); |
| | 1457 | + $dbw->begin( __METHOD__ ); |
| 1458 | 1458 | if ( $this->watchthis ) { |
| 1459 | 1459 | WatchAction::doWatch( $this->mTitle, $wgUser ); |
| 1460 | 1460 | } else { |
| 1461 | 1461 | WatchAction::doUnwatch( $this->mTitle, $wgUser ); |
| 1462 | 1462 | } |
| 1463 | | - $dbw->commit(); |
| | 1463 | + $dbw->commit( __METHOD__ ); |
| 1464 | 1464 | } |
| 1465 | 1465 | } |
| 1466 | 1466 | |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1467 | 1467 | Merged /trunk/phase3/includes:r111658,111965-111967,112021 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1468 | 1468 | Merged /trunk/phase3:r111658,111965-111967,112021 |