summaryrefslogtreecommitdiff
path: root/program/lib/MDB2/Driver/Function
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-03-12 08:13:59 +0000
committeralecpl <alec@alec.pl>2010-03-12 08:13:59 +0000
commit7244b4500e2b685cee5e9c4746a87f12acb56297 (patch)
tree7649eb06e5ae60b8de741256add44cd74443d47b /program/lib/MDB2/Driver/Function
parentbc404ffd41c3411510a022ae5b0c9f2bfe8f5db1 (diff)
- Merge changes from MDB2's trunk
Diffstat (limited to 'program/lib/MDB2/Driver/Function')
-rw-r--r--program/lib/MDB2/Driver/Function/mssql.php6
-rw-r--r--program/lib/MDB2/Driver/Function/mysql.php6
-rw-r--r--program/lib/MDB2/Driver/Function/mysqli.php8
-rw-r--r--program/lib/MDB2/Driver/Function/pgsql.php6
-rw-r--r--program/lib/MDB2/Driver/Function/sqlite.php6
-rw-r--r--program/lib/MDB2/Driver/Function/sqlsrv.php4
6 files changed, 18 insertions, 18 deletions
diff --git a/program/lib/MDB2/Driver/Function/mssql.php b/program/lib/MDB2/Driver/Function/mssql.php
index 972c5adfe..69a002f9a 100644
--- a/program/lib/MDB2/Driver/Function/mssql.php
+++ b/program/lib/MDB2/Driver/Function/mssql.php
@@ -42,7 +42,7 @@
// | Author: Frank M. Kromann <frank@kromann.info> |
// +----------------------------------------------------------------------+
//
-// $Id: mssql.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: mssql.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Function/Common.php';
@@ -71,9 +71,9 @@ class MDB2_Driver_Function_mssql 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;
}
diff --git a/program/lib/MDB2/Driver/Function/mysql.php b/program/lib/MDB2/Driver/Function/mysql.php
index 81d9911f3..f34bed651 100644
--- a/program/lib/MDB2/Driver/Function/mysql.php
+++ b/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;
}
diff --git a/program/lib/MDB2/Driver/Function/mysqli.php b/program/lib/MDB2/Driver/Function/mysqli.php
index b5adc2ae8..86a693259 100644
--- a/program/lib/MDB2/Driver/Function/mysqli.php
+++ b/program/lib/MDB2/Driver/Function/mysqli.php
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: mysqli.php 253106 2008-02-17 18:54:08Z quipo $
+// $Id: mysqli.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Function/Common.php';
@@ -71,9 +71,9 @@ class MDB2_Driver_Function_mysqli 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;
}
@@ -84,7 +84,7 @@ class MDB2_Driver_Function_mysqli extends MDB2_Driver_Function_Common
}
$query = 'CALL '.$name;
$query .= $params ? '('.implode(', ', $params).')' : '()';
- $result =& $db->query($query, $types, $result_class, $result_wrap_class);
+ $result = $db->query($query, $types, $result_class, $result_wrap_class);
if (!$multi_query) {
$db->setOption('multi_query', false);
}
diff --git a/program/lib/MDB2/Driver/Function/pgsql.php b/program/lib/MDB2/Driver/Function/pgsql.php
index 75cad08eb..ae9519075 100644
--- a/program/lib/MDB2/Driver/Function/pgsql.php
+++ b/program/lib/MDB2/Driver/Function/pgsql.php
@@ -42,7 +42,7 @@
// | Author: Paul Cooper <pgc@ucecom.com> |
// +----------------------------------------------------------------------+
//
-// $Id: pgsql.php 268669 2008-11-09 19:46:50Z quipo $
+// $Id: pgsql.php 295587 2010-02-28 17:16:38Z quipo $
require_once 'MDB2/Driver/Function/Common.php';
@@ -69,9 +69,9 @@ class MDB2_Driver_Function_pgsql 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;
}
diff --git a/program/lib/MDB2/Driver/Function/sqlite.php b/program/lib/MDB2/Driver/Function/sqlite.php
index 307a5c834..34e4fcb48 100644
--- a/program/lib/MDB2/Driver/Function/sqlite.php
+++ b/program/lib/MDB2/Driver/Function/sqlite.php
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: sqlite.php 292715 2009-12-28 14:06:34Z quipo $
+// $Id: sqlite.php 295587 2010-02-28 17:16:38Z quipo $
//
require_once 'MDB2/Driver/Function/Common.php';
@@ -147,12 +147,12 @@ class MDB2_Driver_Function_sqlite extends MDB2_Driver_Function_Common
*/
function replace($str, $from_str, $to_str)
{
- $db =& $this->getDBInstance();
+ $db = $this->getDBInstance();
if (PEAR::isError($db)) {
return $db;
}
- $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ $error = $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
'method not implemented', __FUNCTION__);
return $error;
}
diff --git a/program/lib/MDB2/Driver/Function/sqlsrv.php b/program/lib/MDB2/Driver/Function/sqlsrv.php
index 4b1f35a40..055dc9d37 100644
--- a/program/lib/MDB2/Driver/Function/sqlsrv.php
+++ b/program/lib/MDB2/Driver/Function/sqlsrv.php
@@ -67,9 +67,9 @@ class MDB2_Driver_Function_sqlsrv 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;
}