aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-03-27 18:11:38 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-03-27 18:11:38 +0100
commit43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660 (patch)
tree9636b526a167b3fae7617f442c93c5db1acc05ea /phpBB/includes/db
parent94a15f85a64db283a9c9402c40b2d35cb484fb37 (diff)
parentb583f6d8d9ad6ea3f2a1dafbfd479f8a2d67551c (diff)
downloadforums-43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660.tar
forums-43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660.tar.gz
forums-43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660.tar.bz2
forums-43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660.tar.xz
forums-43b6ae3fee34e03ce579ca24ed4cf58f4a1f4660.zip
Merge remote-tracking branch 'phpbb/develop' into ticket/11469
* phpbb/develop: [ticket/11476] Remove pass-by-reference from sql_mutli_insert [ticket/11466] Remove old database driver files from PHPUnit exclude [ticket/11448] Use of $user_id parameter to mark a user's notifications read [ticket/11460] Add default behaviour tests for notification and email types. [ticket/11460] Configure functional test board email using dummy SMTP data. [ticket/11460] Add test for whether post_email and topic_email are checked. [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case. [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/driver/driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 8dda94bc2c..b915ee081b 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -568,12 +568,12 @@ class phpbb_db_driver
* Run more than one insert statement.
*
* @param string $table table name to run the statements on
- * @param array &$sql_ary multi-dimensional array holding the statement data.
+ * @param array $sql_ary multi-dimensional array holding the statement data.
*
* @return bool false if no statements were executed.
* @access public
*/
- function sql_multi_insert($table, &$sql_ary)
+ function sql_multi_insert($table, $sql_ary)
{
if (!sizeof($sql_ary))
{