diff options
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB.php | 3 | ||||
| -rw-r--r-- | system/database/DB_driver.php | 24 | ||||
| -rw-r--r-- | system/database/DB_result.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 18 | ||||
| -rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 10 |
5 files changed, 29 insertions, 28 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index eb25273a1..ef67c80c8 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -44,8 +44,7 @@ function &DB($params = '', $active_record_override = FALSE) show_error('You have specified an invalid database connection group.');
}
- $params = $db[$active_group];
- }
+ $params = $db[$active_group] }
elseif (is_string($params))
{
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 60f51d757..1678cffd5 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -142,7 +142,7 @@ class CI_DB_driver { {
$this->display_error('db_unable_to_create', $this->database);
}
- return FALSE;
+ return FALSE;
}
else
{
@@ -221,7 +221,7 @@ class CI_DB_driver { {
return $this->display_error('db_unsupported_function');
}
- return FALSE;
+ return FALSE;
}
if ($this->dbdriver == 'oci8')
@@ -258,7 +258,7 @@ class CI_DB_driver { log_message('error', 'Invalid query: '.$sql);
return $this->display_error('db_invalid_query');
}
- return FALSE;
+ return FALSE;
}
// Verify table prefix and replace if necessary
@@ -543,12 +543,12 @@ class CI_DB_driver { $this->_trans_status = TRUE;
}
- log_message('debug', 'DB Transaction Failure');
- return FALSE;
+ log_message('debug', 'DB Transaction Failure');
+ return FALSE;
}
$this->trans_commit();
- return TRUE;
+ return TRUE;
}
// --------------------------------------------------------------------
@@ -755,7 +755,7 @@ class CI_DB_driver { {
return $this->display_error('db_unsupported_function');
}
- return FALSE;
+ return FALSE;
}
$retval = array();
@@ -815,7 +815,7 @@ class CI_DB_driver { {
return $this->display_error('db_field_param_missing');
}
- return FALSE;
+ return FALSE;
}
if (FALSE === ($sql = $this->_list_columns($this->prep_tablename($table))))
@@ -824,7 +824,7 @@ class CI_DB_driver { {
return $this->display_error('db_unsupported_function');
}
- return FALSE;
+ return FALSE;
}
$query = $this->query($sql);
@@ -887,7 +887,7 @@ class CI_DB_driver { {
return $this->display_error('db_field_param_missing');
}
- return FALSE;
+ return FALSE;
}
$query = $this->query($this->_field_data($this->prep_tablename($table)));
@@ -906,7 +906,7 @@ class CI_DB_driver { */
function insert_string($table, $data)
{
- $fields = array();
+ $fields = array();
$values = array();
foreach($data as $key => $val)
@@ -1039,7 +1039,7 @@ class CI_DB_driver { {
return $this->display_error('db_unsupported_function');
}
- return FALSE;
+ return FALSE;
}
else
{
diff --git a/system/database/DB_result.php b/system/database/DB_result.php index d8d0d0d97..2a7824ff5 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -104,7 +104,7 @@ class CI_DB_result { return array();
}
- $this->_data_seek(0);
+ $this->_data_seek(0);
while ($row = $this->_fetch_assoc())
{
$this->result_array[] = $row;
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 8df6c1b70..889ea17fb 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -246,15 +246,15 @@ class CI_DB_mysql_driver extends CI_DB { function escape_str($str)
{
if (is_array($str))
- {
- foreach($str as $key => $val)
- {
- $str[$key] = $this->escape_str($val);
- }
-
- return $str;
- }
-
+ {
+ foreach($str as $key => $val)
+ {
+ $str[$key] = $this->escape_str($val);
+ }
+
+ return $str;
+ }
+
if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id))
{
return mysql_real_escape_string($str, $this->conn_id);
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 73373c882..20ab925fd 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -42,13 +42,15 @@ class CI_DB_oci8_result extends CI_DB_result { */
function num_rows()
{
- $rowcount = count($this->result_array());
- @ociexecute($this->stmt_id);
- if ($this->curs_id)
+ $rowcount = count($this->result_array());
+ @ociexecute($this->stmt_id);
+
+ if ($this->curs_id)
{
@ociexecute($this->curs_id);
}
- return $rowcount;
+
+ return $rowcount;
}
// --------------------------------------------------------------------
|