Added check for quote mark
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 1a84404..750c02e 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -313,7 +313,10 @@
$str = $this->conn_id->quote($str);
//If there are duplicated quotes, trim them away
- $str = substr($str, 1, -1);
+ if(strpos($str, "'") === 0)
+ {
+ $str = substr($str, 1, -1);
+ }
// escape LIKE condition wildcards
if ($like === TRUE)
@@ -349,25 +352,7 @@
*/
function insert_id($name=NULL)
{
- //Convenience method for postgres insertid
- if(strpos($this->hostname, 'pgsql') !== FALSE)
- {
- $v = $this->_version();
-
- $table = func_num_args() > 0 ? func_get_arg(0) : NULL;
-
- if ($table == NULL && $v >= '8.1')
- {
- $sql='SELECT LASTVAL() as ins_id';
- }
- $query = $this->query($sql);
- $row = $query->row();
- return $row->ins_id;
- }
- else
- {
- return $this->conn_id->lastInsertId($name);
- }
+ return $this->conn_id->lastInsertId($name);
}
// --------------------------------------------------------------------
@@ -418,7 +403,6 @@
if ($prefix_limit !== FALSE AND $this->dbprefix != '')
{
- //$sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_chr);
return FALSE; // not currently supported
}