summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorJamie Rumbelow <jamie@jamierumbelow.net>2012-03-08 13:52:24 +0100
committerJamie Rumbelow <jamie@jamierumbelow.net>2012-03-08 13:52:24 +0100
commit0cd8c798de4b99b5ad41bacdeef77a4a7b815a03 (patch)
tree7d4b58df441a5aa8fd9752d56ddaa0b8935dd944 /system/database
parent0c09299363bb27d6a115ee1377167a6bc71e09a7 (diff)
Just the method, not the property
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_query_builder.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 986916964..9e1c605ec 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1208,7 +1208,7 @@ class CI_DB_driver {
{
if ( ! is_bool($protect_identifiers))
{
- $protect_identifiers = $this->protect_identifiers;
+ $protect_identifiers = $this->_protect_identifiers;
}
if (is_array($item))
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 7691d5eba..8979dc15b 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -418,7 +418,7 @@ class CI_DB_query_builder extends CI_DB_driver {
// If the escape value was not set will will base it on the global setting
if ( ! is_bool($escape))
{
- $escape = $this->protect_identifiers;
+ $escape = $this->_protect_identifiers;
}
foreach ($key as $k => $v)
@@ -2121,7 +2121,7 @@ class CI_DB_query_builder extends CI_DB_driver {
// If we are "protecting identifiers" we need to examine the "from"
// portion of the query to determine if there are any aliases
- if ($this->protect_identifiers === TRUE AND count($this->qb_cache_from) > 0)
+ if ($this->_protect_identifiers === TRUE AND count($this->qb_cache_from) > 0)
{
$this->_track_aliases($this->qb_from);
}