aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/dbal.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-07-02 23:11:21 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-07-02 23:11:21 +0200
commitfe1f21d1a55ac15b278d99c3a73a8e3424a38fd5 (patch)
treee3ed655aaaadcad8452cc1ddd061adbfaf3e300e /phpBB/includes/db/dbal.php
parentad9d6506594f90ac7c6cdf20a5718d28042059c9 (diff)
downloadforums-fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5.tar
forums-fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5.tar.gz
forums-fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5.tar.bz2
forums-fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5.tar.xz
forums-fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5.zip
[ticket/10942] Use ANSI SQL standard || in dbal.php
PHPBB3-10942
Diffstat (limited to 'phpBB/includes/db/dbal.php')
-rw-r--r--phpBB/includes/db/dbal.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 8dbcd73b58..fded27a001 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -311,7 +311,7 @@ class dbal
*/
function sql_concatenate($expr1, $expr2)
{
- return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
+ return $expr1 . ' || ' . $expr2;
}
/**