aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration/data/v31x/v311.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-11-02 01:25:51 +0100
committerNils Adermann <naderman@naderman.de>2014-11-02 01:25:51 +0100
commit0e772afb9db640e54e84cfccaddcf74f3edbb3fb (patch)
tree4d944f0f6c18a369683e243bcc8b94ebdb6ae3d2 /phpBB/phpbb/db/migration/data/v31x/v311.php
parenta61299a9408dd3ae4a2fa97fdc2df62ca41ee150 (diff)
parentb6a4f83c412d4db7596ad677eca5551a5fc715d8 (diff)
downloadforums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar
forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.gz
forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.bz2
forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.xz
forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.zip
Merge branch 'prep-release-3.1.1' into develop-ascraeus
* prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb/db/migration/data/v31x/v311.php')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/v311.php32
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v311.php b/phpBB/phpbb/db/migration/data/v31x/v311.php
new file mode 100644
index 0000000000..00844dd4c0
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/v311.php
@@ -0,0 +1,32 @@
+<?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 v311 extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v310\gold',
+ '\phpbb\db\migration\data\v31x\style_update',
+ );
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.update', array('version', '3.1.1')),
+ );
+ }
+}