summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorCosmin Atanasiu <innorogue@gmail.com>2012-05-01 07:51:17 +0200
committerCosmin Atanasiu <innorogue@gmail.com>2012-05-01 07:51:17 +0200
commit0b10a8c71cd8a60281f8dbe872ae4ba0404ac2c3 (patch)
tree4f53c80080cb6de730faf0bdbfd25677ebc66df4 /system/libraries
parenta5918ebb5354f6e8bea0149fd95fc98412d461eb (diff)
Update system/libraries/Javascript.php
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Javascript.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index b56dd9888..008136192 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -723,14 +723,14 @@ class CI_Javascript {
{
if (is_object($result))
{
- if (is_callable( array( $result, "result_array" ) ))
- {
- $json_result = $result->result_array();
- }
- else
- {
- $json_result = (array)$result;
- }
+ if (is_callable( array( $result, "result_array" ) ))
+ {
+ $json_result = $result->result_array();
+ }
+ else
+ {
+ $json_result = (array)$result;
+ }
}
elseif (is_array($result))
{