Merge pull request #1437 from ckdarby/issue_1374
Fixing extra td; Issue #1374
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 0f8404d..06b68db 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -247,7 +247,7 @@
{
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 @@
{
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 ce9b068..96c5938 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -232,6 +232,7 @@
- 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
=============