Skip to content

Commit

Permalink
suppress warnings so test runner doesn't fart
Browse files Browse the repository at this point in the history
  • Loading branch information
robmcvey committed Mar 13, 2015
1 parent b880714 commit 3b01c5f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/View/JsonView.php
Expand Up @@ -149,9 +149,9 @@ protected function _serialize($serialize) {
}

if (version_compare(PHP_VERSION, '5.4.0', '>=') && Configure::read('debug')) {
$json = json_encode($data, JSON_PRETTY_PRINT);
$json = @json_encode($data, JSON_PRETTY_PRINT);
} else {
$json = json_encode($data);
$json = @json_encode($data);
}

if (function_exists('json_last_error') && json_last_error() !== JSON_ERROR_NONE) {
Expand Down

0 comments on commit 3b01c5f

Please sign in to comment.