diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-12-12 10:28:10 -0800 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-12-12 10:28:10 -0800 |
| commit | a59bbeed2dd82b316f1e2f9ad484b978ef2a541c (patch) | |
| tree | f3d667b7711b44fa56f6d575b8ae2bc072682d23 /phpBB/phpbb/db/migration/data/v310/softdelete_p2.php | |
| parent | 2ae6f216f66466a1851f52cbc9839e3405525981 (diff) | |
| parent | da6ced59d9632fec5103ce4bea86eb6bcceb5d1e (diff) | |
| download | forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.gz forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.bz2 forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.xz forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.zip | |
[ticket/11966] Merge branch 'develop' into ticket/11966
PHPBB3-11966
Diffstat (limited to 'phpBB/phpbb/db/migration/data/v310/softdelete_p2.php')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/softdelete_p2.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php index 0c32e474f4..38b190c766 100644 --- a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php @@ -34,7 +34,10 @@ class softdelete_p2 extends \phpbb\db\migration\migration ), 'drop_keys' => array( $this->table_prefix . 'posts' => array('post_approved'), - $this->table_prefix . 'topics' => array('forum_appr_last'), + $this->table_prefix . 'topics' => array( + 'forum_appr_last', + 'topic_approved', + ), ), ); } @@ -63,6 +66,7 @@ class softdelete_p2 extends \phpbb\db\migration\migration ), $this->table_prefix . 'topics' => array( 'forum_appr_last' => array('forum_id', 'topic_approved', 'topic_last_post_id'), + 'topic_approved' => array('topic_approved'), ), ), ); |