7 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index c040fa8e2d..e85de28a4c 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -301,15 +301,15 @@ class dbal
 	}
 
 	/**
-	* Build a concatenated string
+	* Build a concatenated expression
 	*
-	* @param	string	$string1		Base SQL statement where we append the second one
-	* @param	string	$string2		SQL statement that is appended on the first statement
+	* @param	string	$expr1		Base SQL expression where we append the second one
+	* @param	string	$expr2		SQL expression that is appended to the first expression
 	* @return	string		Concatenated string
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return 'CONCAT(' . $string1 . ', ' . $string2 . ')';
+		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
 	}
 
 	/**
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 884206d298..d6b16d0342 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -113,9 +113,9 @@ class dbal_firebird extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' || ' . $string2;
+		return $expr1 . ' || ' . $expr2;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index ca8846b60d..c64b289724 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -106,9 +106,9 @@ class dbal_mssql extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' + ' . $string2;
+		return $expr1 . ' + ' . $expr2;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 814dd76373..d026e2d754 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -124,9 +124,9 @@ class dbal_mssql_odbc extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' + ' . $string2;
+		return $expr1 . ' + ' . $expr2;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index c6c34c8612..36c52278d6 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -272,9 +272,9 @@ class dbal_mssqlnative extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' + ' . $string2;
+		return $expr1 . ' + ' . $expr2;
 	}
 
 	/**
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index a27fbb9d9f..9da2fd0b40 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -169,9 +169,9 @@ class dbal_postgres extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' || ' . $string2;
+		return $expr1 . ' || ' . $expr2;
 	}
 
 	/**
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 38aba0624e..6eb77e5a70 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -75,9 +75,9 @@ class dbal_sqlite extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_concatenate($string1, $string2)
+	function sql_concatenate($expr1, $expr2)
 	{
-		return $string1 . ' || ' . $string2;
+		return $expr1 . ' || ' . $expr2;
 	}
 
 	/**