aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-08 16:39:33 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-08 16:39:33 +0100
commit0028ed3e956f2d8e418e0cd26be34cff133ef672 (patch)
treee16b30e9bca56e17dbd5ab5a59bae5f6636086a1 /phpBB/phpbb/db
parentb6fee9f536f01d85ae8233dd5259992ce6c6e143 (diff)
parent2ab7b124193ab87eeca8eef5d0e50eebd37d3336 (diff)
downloadforums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar
forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.gz
forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.bz2
forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.xz
forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php35
1 files changed, 35 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php b/phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php
new file mode 100644
index 0000000000..634e50ff19
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php
@@ -0,0 +1,35 @@
+<?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 increase_size_of_dateformat extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array(
+ '\phpbb\db\migration\data\v31x\v316',
+ );
+ }
+
+ public function update_schema()
+ {
+ return array(
+ 'change_columns' => array(
+ $this->table_prefix . 'users' => array(
+ 'user_dateformat' => array('VCHAR:64', 'd M Y H:i'),
+ ),
+ ),
+ );
+ }
+}