summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-11-05 14:52:06 +0100
committerAlex Bilbie <alex@alexbilbie.com>2012-11-05 14:52:06 +0100
commitf4a448e2be54dd0c4054acc0fde316a6a3c41a80 (patch)
tree0ca5859d0b505b461406478c6d925ba352949664 /system/database
parent7b18a3f268ba622cf938ac460d07bd58cb1eea06 (diff)
parentdc6fba5492a215b40c254ed6f704c580427cdfea (diff)
Merge pull request #1948 from GDmac/develop
Fix #1946 dbforge add_key
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index d2d99ccea..f46237e25 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -182,7 +182,7 @@ abstract class CI_DB_forge {
*/
public function add_key($key = '', $primary = FALSE)
{
- if (is_array($key))
+ if ($primary && is_array($key))
{
foreach ($key as $one)
{