From 15315ac87a68834e2d560acf62756f628a26da45 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 14 Jan 2017 14:27:38 +0100
Subject: [PATCH] [ticket/15008] Disable emoji when smilies are disabled

Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.

PHPBB3-15008
---
 phpBB/phpbb/textformatter/s9e/parser.php       |  2 ++
 .../tickets_data/PHPBB3-15008.before.php       | 18 ++++++++++++++++++
 .../tickets_data/PHPBB3-15008.html             |  1 +
 .../tickets_data/PHPBB3-15008.txt              |  1 +
 4 files changed, 22 insertions(+)
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-15008.before.php
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-15008.html
 create mode 100644 tests/text_processing/tickets_data/PHPBB3-15008.txt

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');
 	}
 
 	/**
diff --git a/tests/text_processing/tickets_data/PHPBB3-15008.before.php b/tests/text_processing/tickets_data/PHPBB3-15008.before.php
new file mode 100644
index 0000000000..a3243e74cd
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-15008.before.php
@@ -0,0 +1,18 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+function before_assert_phpbb3_15008($vars)
+{
+	extract($vars);
+	$parser->disable_smilies();
+}
diff --git a/tests/text_processing/tickets_data/PHPBB3-15008.html b/tests/text_processing/tickets_data/PHPBB3-15008.html
new file mode 100644
index 0000000000..7642eb63ee
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-15008.html
@@ -0,0 +1 @@
+No smilies :) or shortnames :strawberry:
\ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-15008.txt b/tests/text_processing/tickets_data/PHPBB3-15008.txt
new file mode 100644
index 0000000000..7642eb63ee
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-15008.txt
@@ -0,0 +1 @@
+No smilies :) or shortnames :strawberry:
\ No newline at end of file