aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-07 22:12:37 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-07 22:12:37 +0200
commit9d6cef2225f704bbaee40b21d4ef74a112285016 (patch)
treecc5aefce5c6389b9331d667a3075ec1bb1b8dbab /phpBB/phpbb/db/migration
parent10e99b018a6ecd43f1ffdfafb67b2e4303fd19b1 (diff)
parent5b186c936d6d6d67b8b0551a990522fdc68e2a4c (diff)
downloadforums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar
forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.gz
forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.bz2
forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.xz
forums-9d6cef2225f704bbaee40b21d4ef74a112285016.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/phpbb/db/migration')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/rc5.php33
1 files changed, 33 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/rc5.php b/phpBB/phpbb/db/migration/data/v310/rc5.php
new file mode 100644
index 0000000000..5b6f70e32e
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/rc5.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class rc5 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v310\rc4',
+ '\phpbb\db\migration\data\v310\profilefield_field_validation_length',
+ '\phpbb\db\migration\data\v310\remove_acp_styles_cache',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.0-RC5')),
+ );
+ }
+}