Skip to content

Commit

Permalink
Update system/libraries/Javascript.php
Browse files Browse the repository at this point in the history
  • Loading branch information
Kosmin committed May 1, 2012
1 parent a5918eb commit 0b10a8c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions system/libraries/Javascript.php
Expand Up @@ -723,14 +723,14 @@ public function generate_json($result = NULL, $match_array_type = FALSE)
{
if (is_object($result))
{
if (is_callable( array( $result, "result_array" ) ))
{
$json_result = $result->result_array();
}
else
{
$json_result = (array)$result;
}
if (is_callable( array( $result, "result_array" ) ))
{
$json_result = $result->result_array();
}
else
{
$json_result = (array)$result;
}
}
elseif (is_array($result))
{
Expand Down

0 comments on commit 0b10a8c

Please sign in to comment.