Skip to content

Commit

Permalink
Whitespace fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kvz committed Apr 18, 2011
1 parent 9d5183f commit e70728f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion controllers/components/rest.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public function beforeRender (&$Controller) {

// if a callback function is requested, pass the callback name to the controller
// responds if following query parameters present: jsoncallback, callback
$callback = false;
$callback = false;
$json_callback_keys = array('jsoncallback', 'callback');
foreach ($json_callback_keys as $key) {
if (array_key_exists($key, $this->Controller->params['url'])) {
Expand Down
10 changes: 5 additions & 5 deletions views/json.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ public function json_format ($json) {
}
}

// Return true json at all cost
if (false === json_decode($new_json)) {
// If we messed up the semantics, return original
return $json;
}
// Return true json at all cost
if (false === json_decode($new_json)) {
// If we messed up the semantics, return original
return $json;
}

return $new_json;
}
Expand Down

0 comments on commit e70728f

Please sign in to comment.