mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

[ticket/10942] Change term string to expression to avoid confusion

Browse Source 
PHPBB3-10942
This commit is contained in:
Joas Schilling
2012-06-20 12:50:12 +02:00
parent c8e322d88f
commit 79dfdf9406
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/db/dbal.php
View File

@@ -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 . ')';
}
/**