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

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', '')),
+		);
+	}
+}