From fe1f21d1a55ac15b278d99c3a73a8e3424a38fd5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 2 Jul 2012 23:11:21 +0200
Subject: [ticket/10942] Use ANSI SQL standard || in dbal.php
PHPBB3-10942
---
phpBB/includes/db/mysql.php | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'phpBB/includes/db/mysql.php')
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index eb38e3e913..3cda5cc1e0 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -119,6 +119,14 @@ class dbal_mysql extends dbal
return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
}
+ /**
+ * {@inheritDoc}
+ */
+ function sql_concatenate($expr1, $expr2)
+ {
+ return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
+ }
+
/**
* SQL Transaction
* @access private
--
cgit v1.2.1
From 6776feb0de667340d640744462d00436f893c45f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 14:05:03 +0200
Subject: [ticket/10942] Add access modifiers
PHPBB3-10942
---
phpBB/includes/db/mysql.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/includes/db/mysql.php')
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 3cda5cc1e0..8d1f805870 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -122,7 +122,7 @@ class dbal_mysql extends dbal
/**
* {@inheritDoc}
*/
- function sql_concatenate($expr1, $expr2)
+ public function sql_concatenate($expr1, $expr2)
{
return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
}
--
cgit v1.2.1