aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-08 16:06:08 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-08 16:06:08 +0200
commita291825685edcb00c5896facd4c7a4ae535de721 (patch)
treec3795f0a297ce44e3d474719095111f0144c79bf /phpBB/phpbb/db
parenteeb80d2ec5e7103c3c1dfaa42e81bc325573c914 (diff)
parent0465e9d1b94627ad748f70b6f5918737ba3cfc8e (diff)
downloadforums-a291825685edcb00c5896facd4c7a4ae535de721.tar
forums-a291825685edcb00c5896facd4c7a4ae535de721.tar.gz
forums-a291825685edcb00c5896facd4c7a4ae535de721.tar.bz2
forums-a291825685edcb00c5896facd4c7a4ae535de721.tar.xz
forums-a291825685edcb00c5896facd4c7a4ae535de721.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12738] Pass $this->config in content_visibility constructor
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
index f5970e74b2..6335c75398 100644
--- a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
+++ b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
@@ -119,6 +119,7 @@ class soft_delete_mod_convert extends \phpbb\db\migration\migration
{
return new \phpbb\content_visibility(
new \phpbb\auth\auth(),
+ $this->config,
$this->db,
new \phpbb\user(),
$this->phpbb_root_path,