Merge branch '3.1.x'

This commit is contained in:
Oliver Schramm 2016-01-08 18:22:40 +01:00
commit f6524f4902

View file

@ -18,7 +18,7 @@ class increase_size_of_dateformat extends \phpbb\db\migration\migration
static public function depends_on() static public function depends_on()
{ {
return array( 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( return array(
'change_columns' => array( 'change_columns' => array(
$this->table_prefix . 'users' => 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'),
), ),
), ),
); );