diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-20 12:50:12 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-20 12:50:12 +0200 |
| commit | 79dfdf94063cf7cc64197e50807977acaf9a2e66 (patch) | |
| tree | 86b68e0a2920e06cbd46ec4f17c63eaac38ccf4e /phpBB/includes/db/dbal.php | |
| parent | c8e322d88f8195727c18eac90d30a5919e6fb8a0 (diff) | |
| download | forums-79dfdf94063cf7cc64197e50807977acaf9a2e66.tar forums-79dfdf94063cf7cc64197e50807977acaf9a2e66.tar.gz forums-79dfdf94063cf7cc64197e50807977acaf9a2e66.tar.bz2 forums-79dfdf94063cf7cc64197e50807977acaf9a2e66.tar.xz forums-79dfdf94063cf7cc64197e50807977acaf9a2e66.zip | |
[ticket/10942] Change term string to expression to avoid confusion
PHPBB3-10942
Diffstat (limited to 'phpBB/includes/db/dbal.php')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 10 |
1 files changed, 5 insertions, 5 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 . ')'; } /** |