summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Javascript.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 008136192..dd2df697c 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -723,14 +723,7 @@ class CI_Javascript {
{
if (is_object($result))
{
- if (is_callable( array( $result, "result_array" ) ))
- {
- $json_result = $result->result_array();
- }
- else
- {
- $json_result = (array)$result;
- }
+ $json_result = is_callable(array($result, 'result_array')) ? $result->result_array() : (array) $result;
}
elseif (is_array($result))
{