summaryrefslogtreecommitdiffstats
path: root/system/libraries/Table.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-06 19:48:22 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-06 19:48:22 +0200
commit296ab9a06e3c648de56861ad67581236a6dae71a (patch)
tree136126cc057bc58000f020990e32685c89adf399 /system/libraries/Table.php
parent47b673324f06236264ca64f8c3155aab51762609 (diff)
parent61fb9c1596ea220a0a8106160c5c68f9343ff9df (diff)
Merge pull request #1437 from ckdarby/issue_1374
Fixing extra td; Issue #1374
Diffstat (limited to 'system/libraries/Table.php')
-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 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;
}
// --------------------------------------------------------------------