diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-08-21 14:43:31 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-08-21 14:43:31 +0200 |
| commit | 993925b47a0bfb08e79961c47bcc3d247a03a5dd (patch) | |
| tree | 4012e1f02407efb333a20c67e5d7d1cac8249b9f /system/database/drivers | |
| parent | 719b65d54a85337c5616a781eff07d5031c106e9 (diff) | |
whitespace fixes
a minor re-ordering of the changelog
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 18 | ||||
| -rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 10 |
2 files changed, 15 insertions, 13 deletions
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;
}
// --------------------------------------------------------------------
|