aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 12:49:07 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 12:49:07 +0200
commit854854b60f2b452df57482667cd211bddd123663 (patch)
tree5d8c4d3c5cc60441152abe78705763e7f0cfb31d /phpBB/phpbb/db
parente511ea71c17b34fb6bb5233831c6b0b88b1f98b8 (diff)
parent45e39d0990c01f005a7dccc5a36de3dd0f62c585 (diff)
downloadforums-854854b60f2b452df57482667cd211bddd123663.tar
forums-854854b60f2b452df57482667cd211bddd123663.tar.gz
forums-854854b60f2b452df57482667cd211bddd123663.tar.bz2
forums-854854b60f2b452df57482667cd211bddd123663.tar.xz
forums-854854b60f2b452df57482667cd211bddd123663.zip
Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/board_contact_name.php30
1 files changed, 30 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/board_contact_name.php b/phpBB/phpbb/db/migration/data/v310/board_contact_name.php
new file mode 100644
index 0000000000..37b4d50545
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/board_contact_name.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class board_contact_name extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return isset($this->config['board_contact_name']);
+ }
+
+ static public function depends_on()
+ {
+ return array('\phpbb\db\migration\data\v310\beta2');
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('config.add', array('board_contact_name', '')),
+ );
+ }
+}