diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-05-02 11:47:42 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-05-02 11:47:42 +0200 |
| commit | bd738c80a623700b3b11e876abb764ca6d57769d (patch) | |
| tree | 7ceec96d9dc36bb524acff0946e9eb0db03f90d0 /system/libraries/Javascript.php | |
| parent | 721c77fcf347751895623514fb2e4c89390afa67 (diff) | |
| parent | 02b80cbe5aae7e474b097c149ab6479de9ab0f91 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-odbc
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)) { |