Permalink
Browse files

Just the method, not the property

  • Loading branch information...
1 parent 0c09299 commit 0cd8c798de4b99b5ad41bacdeef77a4a7b815a03 @jamierumbelow committed Mar 8, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 system/database/DB_driver.php
  2. +2 −2 system/database/DB_query_builder.php
@@ -1208,7 +1208,7 @@ public function protect_identifiers($item, $prefix_single = FALSE, $protect_iden
{
if ( ! is_bool($protect_identifiers))
{
- $protect_identifiers = $this->protect_identifiers;
+ $protect_identifiers = $this->_protect_identifiers;
}
if (is_array($item))
@@ -418,7 +418,7 @@ protected function _where($key, $value = NULL, $type = 'AND ', $escape = NULL)
// 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 @@ protected function _merge_cache()
// 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);
}

0 comments on commit 0cd8c79

Please sign in to comment.