Skip to content

Commit

Permalink
Just the method, not the property
Browse files Browse the repository at this point in the history
  • Loading branch information
jamierumbelow committed Mar 8, 2012
1 parent 0c09299 commit 0cd8c79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion system/database/DB_driver.php
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions system/database/DB_query_builder.php
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 0cd8c79

Please sign in to comment.