summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorKatsumi Honda <k@qox.jp>2013-04-03 14:31:53 +0200
committerKatsumi Honda <k@qox.jp>2013-04-03 14:31:53 +0200
commit93f0b8f642abbafdb0b543f348ff1655adf919e6 (patch)
tree5b1e5fc6bef8a64d579941e3fe16cf792e85c6e7 /system/database
parenteaeaad5e974223d814ad7e0fa01d1923dc3c571a (diff)
fixed for styleguide.
|| to OR remove the empty line at EOF
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 3e6378448..4f2f491ee 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -816,7 +816,7 @@ abstract class CI_DB_driver {
}
// The query() function will set this flag to FALSE in the event that a query failed
- if ($this->_trans_status === FALSE || $this->_trans_failure === TRUE)
+ if ($this->_trans_status === FALSE or $this->_trans_failure === TRUE)
{
$this->trans_rollback();
@@ -1859,4 +1859,4 @@ abstract class CI_DB_driver {
}
/* End of file DB_driver.php */
-/* Location: ./system/database/DB_driver.php */
+/* Location: ./system/database/DB_driver.php */ \ No newline at end of file