From a459b46e7a5f67a96d0ea85e0778f1bf8858dbdd Mon Sep 17 00:00:00 2001
From: Derek Allard
Date: Thu, 22 May 2008 13:01:39 +0000
Subject: Fixed a bug (#4561) where orhaving() wasn't properly passing values.
Removed some unused variables from the code (#4563).
Fixed a bug where having() was not adding an = into the statement (#4568).
---
system/database/DB_active_rec.php | 8 ++++++--
system/libraries/Email.php | 1 -
system/libraries/Router.php | 1 -
user_guide/changelog.html | 9 ++++++---
4 files changed, 12 insertions(+), 7 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]))
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 568b3b961..9e39cb4b0 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,7 +75,7 @@ SVN Revision: not currently released
Other changes
- Added ability to use xss_clean() to test images for XSS, useful for upload security.
- - Improved security in xss_clean().
+ - Improved security in xss_clean().
- Considerably expanded list of mobile user-agents in config/user_agents.php.
@@ -86,11 +86,14 @@ SVN Revision: not currently released
- Amended fixes for bug (#3419) with parsing DSN database connections.
- - Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
+ - Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
- Fixed a syntax error in upload_lang.php.
- Fixed a bug (#4542) with a regular expression in the Image library.
+ - Fixed a bug (#4561) where orhaving() wasn't properly passing values.
+ - Removed some unused variables from the code (#4563).
+ - Fixed a bug where having() was not adding an = into the statement (#4568).
- Fixed assorted user guide typos or examples (#4574).
-
+
Version 1.6.2
Release Date: May 13, 2008
--
cgit v1.2.3-24-g4f1b