| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -792,7 +792,7 @@ |
| 793 | 793 | */ |
| 794 | 794 | protected function logException( Exception $e, $func, array $params ) { |
| 795 | 795 | wfDebugLog( 'SwiftBackend', |
| 796 | | - get_class( $e ) . " in '{$func}' (given '" . serialize( $params ) . "')" . |
| | 796 | + get_class( $e ) . " in '{$func}' (given '" . FormatJson::encode( $params ) . "')" . |
| 797 | 797 | ( $e instanceof InvalidResponseException |
| 798 | 798 | ? ": {$e->getMessage()}" |
| 799 | 799 | : "" |
| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/FileOp.php |
| — | — | @@ -346,7 +346,7 @@ |
| 347 | 347 | $params['failedAction'] = $action; |
| 348 | 348 | try { |
| 349 | 349 | wfDebugLog( 'FileOperation', |
| 350 | | - get_class( $this ) . ' failed:' . serialize( $params ) ); |
| | 350 | + get_class( $this ) . ' failed:' . FormatJson::encode( $params ) ); |
| 351 | 351 | } catch ( Exception $e ) { |
| 352 | 352 | // bad config? debug log error? |
| 353 | 353 | } |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 354 | 354 | Merged /trunk/phase3/includes:r112839-112840 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 355 | 355 | Merged /trunk/phase3:r112839-112840 |