3 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/helper/file_updater/ftp_file_updater.php b/phpBB/phpbb/install/helper/file_updater/ftp_file_updater.php
index 258a035768..5cdc331cbc 100644
--- a/phpBB/phpbb/install/helper/file_updater/ftp_file_updater.php
+++ b/phpBB/phpbb/install/helper/file_updater/ftp_file_updater.php
@@ -47,7 +47,7 @@ class ftp_file_updater implements file_updater_interface
 	 * @param string		$phpbb_root_path
 	 * @param string		$php_ext
 	 */
-	public function __constructor(update_helper $update_helper, $phpbb_root_path, $php_ext)
+	public function __construct(update_helper $update_helper, $phpbb_root_path, $php_ext)
 	{
 		$this->transfer			= null;
 		$this->update_helper	= $update_helper;
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index 414484920b..139ceabeec 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -72,7 +72,7 @@ class type_date extends type_base
 			'lang_options'			=> $field_data['lang_options'],
 		);
 
-		$always_now = $request->variable('always_now', -1);
+		$always_now = $this->request->variable('always_now', -1);
 		if ($always_now == -1)
 		{
 			$s_checked = ($field_data['field_default_value'] == 'now') ? true : false;
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index e2653d60f0..05ddfffa11 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -142,6 +142,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function disable_smilies()
 	{
 		$this->parser->disablePlugin('Emoticons');
+		$this->parser->disablePlugin('Emoji');
 	}
 
 	/**
@@ -183,6 +184,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function enable_smilies()
 	{
 		$this->parser->enablePlugin('Emoticons');
+		$this->parser->enablePlugin('Emoji');
 	}
 
 	/**