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 | |
| parent | 1ab6f6520ebfc016c49cfbe3a4d9d009be5da268 (diff) | |
| parent | 296ab9a06e3c648de56861ad67581236a6dae71a (diff) | |
Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6
| -rw-r--r-- | system/libraries/Table.php | 6 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 4 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; } // -------------------------------------------------------------------- diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 0b987b1be..211e9acc9 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -233,6 +233,7 @@ Bug fixes for 3.0 - Fixed a bug (#1411) - the :doc:`Email library <libraries/email>` used its own short list of MIMEs instead the one from config/mimes.php. - Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent). - Fixed a bug (#666) - :doc:`Output library <libraries/output>`'s set_content_type() method didn't set the document charset. +- Fixed a bug (#1374) - :doc:`Table Library <libraries/table>` was generating an extra td tag at the start of the tr. Version 2.1.1 ============= |