summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-11-23 11:37:23 +0100
committerAndrey Andreev <narf@devilix.net>2016-11-23 11:37:23 +0100
commitefd856edce0b952c8a7a62ec953ae1baee77ff34 (patch)
tree2399860d6082e43f6f0b65709b60193996c06e49 /system/database
parent21b7a2a2d00bd5645b2ca1afcfa4098e207292a4 (diff)
[ci skip] Styling change after 21b7a2a2d00bd5645b2ca1afcfa4098e207292a4
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index fe81d0510..9add5cab7 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -912,8 +912,8 @@ abstract class CI_DB_forge {
// White-list CURRENT_TIMESTAMP & similar (e.g. Oracle has stuff like SYSTIMESTAMP) defaults for date/time fields
if (
isset($attributes['TYPE'])
- && (stripos($attributes['TYPE'], 'time') !== FALSE || stripos($attributes['TYPE'], 'date') !== FALSE)
- && (stripos($attributes['DEFAULT'], 'time') !== FALSE || stripos($attributes['DEFAULT'], 'date') !== FALSE)
+ && (stripos($attributes['TYPE'], 'time') !== FALSE OR stripos($attributes['TYPE'], 'date') !== FALSE)
+ && (stripos($attributes['DEFAULT'], 'time') !== FALSE OR stripos($attributes['DEFAULT'], 'date') !== FALSE)
)
{
$field['default'] = $this->_default.$attributes['DEFAULT'];