summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-02 09:12:13 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-02 09:12:13 +0200
commit1eb1803e77f49672f8ef7179fbe3ca12257be922 (patch)
tree91141d2ea95d0133bc3ba77f8eed16107b6d98c3 /system/libraries
parente57411502933afad6fca682efb437db05998e532 (diff)
parent3259e98b2b775d6dd932e03ae37b08c6e0465898 (diff)
Merge pull request #1285 from Kosmin/patch-1
Update system/libraries/Javascript.php
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Javascript.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 629a3adfe..dd2df697c 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -723,7 +723,7 @@ class CI_Javascript {
{
if (is_object($result))
{
- $json_result = $result->result_array();
+ $json_result = is_callable(array($result, 'result_array')) ? $result->result_array() : (array) $result;
}
elseif (is_array($result))
{