| commit | 1eb1803e77f49672f8ef7179fbe3ca12257be922 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Wed May 02 00:12:13 2012 -0700 |
| committer | Andrey Andreev <narf@bofh.bg> | Wed May 02 00:12:13 2012 -0700 |
| tree | 91141d2ea95d0133bc3ba77f8eed16107b6d98c3 | |
| parent | e57411502933afad6fca682efb437db05998e532 [diff] | |
| parent | 3259e98b2b775d6dd932e03ae37b08c6e0465898 [diff] |
Merge pull request #1285 from Kosmin/patch-1 Update system/libraries/Javascript.php
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 629a3ad..dd2df69 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php
@@ -723,7 +723,7 @@ { 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)) {