diff options
| author | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-06 20:16:01 +0200 |
|---|---|---|
| committer | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-06 20:16:01 +0200 |
| commit | 7da3c558779a533758ff36444dd4392b1056ad39 (patch) | |
| tree | 8d8f2ab166ab33fd0618bf7ecc8dc9a8845b8b59 /system | |
| parent | 1ab6f6520ebfc016c49cfbe3a4d9d009be5da268 (diff) | |
| parent | 296ab9a06e3c648de56861ad67581236a6dae71a (diff) | |
Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Table.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 0f8404d85..06b68db32 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -247,7 +247,7 @@ class CI_Table { { foreach ($args[0] as $key => $val) { - $args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val); + $ret_args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val); } } } @@ -257,12 +257,12 @@ class CI_Table { { if ( ! is_array($val)) { - $args[$key] = array('data' => $val); + $ret_args[$key] = array('data' => $val); } } } - return $args; + return $ret_args; } // -------------------------------------------------------------------- |