summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:47:19 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-05-23 19:47:19 +0200
commitf777d3ddafcd2a79bbc65d329e1f9586c3a449fb (patch)
tree486b0084985afaa2b96753ed872b0b0c025e9452 /system
parent13a9bf472f548463682d4d3fafce146b9a9ced3c (diff)
parente65f4893c9b3e7c2b34e0fef7c7de04112329063 (diff)
Fixed conflicts with 2.1-stable merge.
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_query_builder.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index d0af66de1..5d215c4e2 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -672,22 +672,22 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$k = $this->protect_identifiers($k);
$prefix = (count($this->qb_like) === 0) ? '' : $type;
$v = $this->escape_like_str($v);
-
+
if ($side === 'none')
{
- $like_statement = $prefix." $k $not LIKE '{$v}'";
+ $like_statement = "{$prefix} $k $not LIKE '{$v}'";
}
elseif ($side === 'before')
{
- $like_statement = $prefix." $k $not LIKE '%{$v}'";
+ $like_statement = "{$prefix} $k $not LIKE '%{$v}'";
}
elseif ($side === 'after')
{
- $like_statement = $prefix." $k $not LIKE '{$v}%'";
+ $like_statement = "{$prefix} $k $not LIKE '{$v}%'";
}
else
{
- $like_statement = $prefix." $k $not LIKE '%{$v}%'";
+ $like_statement = "{$prefix} $k $not LIKE '%{$v}%'";
}
// some platforms require an escape sequence definition for LIKE wildcards
@@ -2343,4 +2343,4 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
}
/* End of file DB_query_builder.php */
-/* Location: ./system/database/DB_query_builder.php */ \ No newline at end of file
+/* Location: ./system/database/DB_query_builder.php */