diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_active_rec.php | 8 | ||||
| -rw-r--r-- | system/libraries/Email.php | 1 | ||||
| -rw-r--r-- | system/libraries/Router.php | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index dcf9d3868..05a04350d 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -804,7 +804,7 @@ class CI_DB_active_record extends CI_DB_driver { function orhaving($key, $value = '', $escape = TRUE)
{
- return $this->or_having($key, $value = '', $escape);
+ return $this->or_having($key, $value, $escape);
}
// --------------------------------------------------------------------
@@ -852,7 +852,11 @@ class CI_DB_active_record extends CI_DB_driver { $k = $this->_protect_identifiers($k);
}
-
+ if ( ! $this->_has_operator($k))
+ {
+ $k .= ' = ';
+ }
+
if ($v != '')
{
$v = ' '.$this->escape_str($v);
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index ab3a24893..8eb47dc85 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1281,7 +1281,6 @@ class CI_Email { {
$float = $this->bcc_batch_size -1;
- $flag = 0;
$set = "";
$chunk = array();
diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6e705f842..c80830fc1 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -252,7 +252,6 @@ class CI_Router { // Turn the segment array into a URI string
$uri = implode('/', $this->uri->segments);
- $num = count($this->uri->segments);
// Is there a literal match? If so we're done
if (isset($this->routes[$uri]))
|