diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-05-02 12:23:03 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-05-02 12:23:03 +0200 |
| commit | 7c0cb844a9be790673542ccb9646f10c036d2cdb (patch) | |
| tree | b8e1f8f6bb06443f1f0618c2e6a686114f2c2286 /system/libraries/Javascript.php | |
| parent | 5815dba069428514ce39e745328a898fc877773f (diff) | |
| parent | 963c96c5507ceb8b5c3de50d0ab959d21dcc8cd1 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlite
Diffstat (limited to 'system/libraries/Javascript.php')
| -rw-r--r-- | system/libraries/Javascript.php | 2 |
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)) { |