aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
commita618710a69cf797d2b64a3567b2d2da327cddc25 (patch)
tree566b60106dea46146039a27e908fa7aceed62401 /phpBB/phpbb
parentacb4d90371cfa2682e74e38c8e3bef087ace7600 (diff)
parent45f2efea19280092da2d58f506c56aee4a998a9d (diff)
downloadforums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.gz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.bz2
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.xz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.zip
Merge branch 'prep-release-3.1.0-b2' into develop-ascraeus
* prep-release-3.1.0-b2: [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 [prep-release-3.1.0-b2] Prepare Changelog [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 [prep-release-3.1.0-b2] Update version to 3.1.0-b2
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/beta2.php29
1 files changed, 29 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/beta2.php b/phpBB/phpbb/db/migration/data/v310/beta2.php
new file mode 100644
index 0000000000..4cf29dfb3d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/beta2.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class beta2 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v310\beta1',
+ '\phpbb\db\migration\data\v310\acp_prune_users_module',
+ '\phpbb\db\migration\data\v310\profilefield_location_cleanup',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.0-b2')),
+ );
+ }
+}