aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:42:07 +0100
committerJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:42:07 +0100
commitfd5e66cbf11ac3e49007369ece339bc937517d93 (patch)
treeb625c33c00c30ce65d72c79f9b3fc68f5c8f038a /phpBB/phpbb
parentd64680983a5fa06a737a1ae7e164cb7f67a5a53c (diff)
parent85e98a9d702cf179dc09a6ad077fac23bb28ae38 (diff)
downloadforums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.gz
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.bz2
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.xz
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.zip
Merge branch 'prep-release-3.1.7' into 3.1.x
Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v317pl1.php31
1 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v317pl1.php b/phpBB/phpbb/db/migration/data/v31x/v317pl1.php
new file mode 100644
index 0000000000..2e1b0e9b9d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/v317pl1.php
@@ -0,0 +1,31 @@
+<?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\v31x;
+
+class v317pl1 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v31x\v317',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.7-pl1')),
+ );
+ }
+}