diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-02 23:32:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-02 23:32:12 +0200 |
| commit | 672c333aced13afdaead43e84bb686f60b371f94 (patch) | |
| tree | f1530eb280f2b4fb3795d56804a4fa1ec1b83881 /phpBB/includes/db | |
| parent | ed95c7195f52b49a611a1e91c43e6ac815a4d005 (diff) | |
| parent | b1a4de3166f3f75fe707292f911076db53a0538d (diff) | |
| download | forums-672c333aced13afdaead43e84bb686f60b371f94.tar forums-672c333aced13afdaead43e84bb686f60b371f94.tar.gz forums-672c333aced13afdaead43e84bb686f60b371f94.tar.bz2 forums-672c333aced13afdaead43e84bb686f60b371f94.tar.xz forums-672c333aced13afdaead43e84bb686f60b371f94.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9685] Test for databases that are able to nest transactions
[ticket/9685] Consistently name the new sql_buffer_nested_transactions function
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mssqlnative.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 148f56b5a8..82fd03b5f3 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -246,7 +246,7 @@ class dbal * * @return bool Whether buffering is required. */ - function sql_buffer_nested_transaction() + function sql_buffer_nested_transactions() { return false; } diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php index 710a054e5f..2287bc716e 100644 --- a/phpBB/includes/db/mssqlnative.php +++ b/phpBB/includes/db/mssqlnative.php @@ -261,7 +261,7 @@ class dbal_mssqlnative extends dbal /** * {@inheritDoc} */ - function sql_buffer_nested_transaction() + function sql_buffer_nested_transactions() { return true; } |