aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2016-01-08 18:22:40 +0100
committerOliver Schramm <oliver.schramm97@gmail.com>2016-01-08 18:22:40 +0100
commitf6524f4902bc843908ade3583d5453ce58b5327a (patch)
tree09d2c8619afe39436753885ca1619738d7fc27db /phpBB/phpbb/db
parentc6c7730e040ee085cdf921bf54f562d18e68f880 (diff)
parent1f16421782639ad4308b59c2faaa06a913bfaa8d (diff)
downloadforums-f6524f4902bc843908ade3583d5453ce58b5327a.tar
forums-f6524f4902bc843908ade3583d5453ce58b5327a.tar.gz
forums-f6524f4902bc843908ade3583d5453ce58b5327a.tar.bz2
forums-f6524f4902bc843908ade3583d5453ce58b5327a.tar.xz
forums-f6524f4902bc843908ade3583d5453ce58b5327a.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php4
1 files changed, 2 insertions, 2 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
index 634e50ff19..bdf83f3d62 100644
--- a/phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php
+++ b/phpBB/phpbb/db/migration/data/v31x/increase_size_of_dateformat.php
@@ -18,7 +18,7 @@ class increase_size_of_dateformat extends \phpbb\db\migration\migration
static public function depends_on()
{
return array(
- '\phpbb\db\migration\data\v31x\v316',
+ '\phpbb\db\migration\data\v31x\v317',
);
}
@@ -27,7 +27,7 @@ class increase_size_of_dateformat extends \phpbb\db\migration\migration
return array(
'change_columns' => array(
$this->table_prefix . 'users' => array(
- 'user_dateformat' => array('VCHAR:64', 'd M Y H:i'),
+ 'user_dateformat' => array('VCHAR_UNI:64', 'd M Y H:i'),
),
),
);