summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-05-20 06:25:46 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-05-20 06:25:46 +0000
commitf77d491f791077a9704b3149cb8fcd50a0ec2484 (patch)
treeb36ef2a025d6ce50a177d314fd04b527cce2a92b
parent7f35e7c05158eaac89b731365bd941aba9ff073f (diff)
- Fix func_get_args() usage for PHP<5.3 (#1487928)
git-svn-id: https://svn.roundcube.net/trunk@4790 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_mdb2.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_mdb2.php b/roundcubemail/program/include/rcube_mdb2.php
index 02ed17ac2..691c75de9 100644
--- a/roundcubemail/program/include/rcube_mdb2.php
+++ b/roundcubemail/program/include/rcube_mdb2.php
@@ -609,6 +609,8 @@ class rcube_mdb2
function concat(/* col1, col2, ... */)
{
$func = '';
+ $args = func_get_args();
+
switch($this->db_provider) {
case 'mysql':
case 'mysqli':
@@ -622,8 +624,8 @@ class rcube_mdb2
default:
$delim = ' || ';
}
-
- return $func . '(' . join($delim, func_get_args()) . ')';
+
+ return $func . '(' . join($delim, $args) . ')';
}