phpBB Master

• 

  Marc 14 Jan 2017 d882911bf5627aa2bdd10edf67f0734afa8ff3af

  Merge branch '3.2.x'
• 

  Marc 14 Jan 2017 42e78004fbe9cce9a77f718a281d95b2c9b1e5d2 m

  Merge pull request #4643 from JoshyPHP/ticket/15008
  [ticket/15008] Disable emoji when smilies are disabled
• 

  JoshyPHP <s9e.dev@gmail.com> 14 Jan 2017 15315ac87a68834e2d560acf62756f628a26da45 m

  [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 (version 15315ac87a68834e2d560acf62756f628a26da45)
  • tests/text_processing/tickets_data/PHPBB3-15008.before.php (version 15315ac87a68834e2d560acf62756f628a26da45)
  • tests/text_processing/tickets_data/PHPBB3-15008.html (version 15315ac87a68834e2d560acf62756f628a26da45)
  • tests/text_processing/tickets_data/PHPBB3-15008.txt (version 15315ac87a68834e2d560acf62756f628a26da45)