summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-07 14:46:32 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-07 14:46:32 +0200
commitd09ff35e8c4b7cae6313cc40ec0e6b57b9f52106 (patch)
tree9826c69e650ccc52634596d0cb2015c70f9b4176 /system/libraries
parent0f0b76980cb07f39b20c8591882aeae3854f016c (diff)
Revert 296ab9a06e3c648de56861ad67581236a6dae71a - there's no bug to fix
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Table.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 06b68db32..0f8404d85 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -247,7 +247,7 @@ class CI_Table {
{
foreach ($args[0] as $key => $val)
{
- $ret_args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
+ $args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
}
}
}
@@ -257,12 +257,12 @@ class CI_Table {
{
if ( ! is_array($val))
{
- $ret_args[$key] = array('data' => $val);
+ $args[$key] = array('data' => $val);
}
}
}
- return $ret_args;
+ return $args;
}
// --------------------------------------------------------------------