summaryrefslogtreecommitdiff
path: root/roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-03-12 08:13:59 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-03-12 08:13:59 +0000
commit7e0e67abb881494f63d6cab74d6dc321916114b1 (patch)
treee4ec2d11a806b5e470633a9a285552e91a057d2c /roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
parentea2192a716fd087f969d01ba1a413756f41ce971 (diff)
- Merge changes from MDB2's trunk
git-svn-id: https://svn.roundcube.net/trunk@3354 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/lib/MDB2/Driver/Function/mysql.php')
-rw-r--r--roundcubemail/program/lib/MDB2/Driver/Function/mysql.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/lib/MDB2/Driver/Function/mysql.php b/roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
index 81d9911f3..f34bed651 100644
--- a/roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
+++ b/roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: mysql.php 253106 2008-02-17 18:54:08Z quipo $
+// $Id: mysql.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Function/Common.php';
@@ -71,9 +71,9 @@ class MDB2_Driver_Function_mysql extends MDB2_Driver_Function_Common
* @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
* @access public
*/
- function &executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
+ function executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}