mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6740 from marc1706/ticket/17304

Browse Source 
[ticket/17304] Use HiDPI smilies provided by rednoah and stop using twemoji
This commit is contained in:
Marc Alexander
2024-10-25 21:23:00 +02:00
committed by GitHub
parent 4985a27dcf 42eed1f917
commit a2b1cc57eb
33 changed files with 164 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php Normal file
View File

@@ -0,0 +1,89 @@
<?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.
*
*/
namespace phpbb\db\migration\data\v400;
use phpbb\db\migration\migration;
class hidpi_smilies extends migration
{
private array $default_smilies = [
'icon_arrow',
'icon_cool',
'icon_cry',
'icon_e_biggrin',
'icon_e_confused',
'icon_e_geek',
'icon_e_sad',
'icon_e_smile',
'icon_e_surprised',
'icon_e_ugeek',
'icon_e_wink',
'icon_eek',
'icon_evil',
'icon_exclaim',
'icon_idea',
'icon_lol',
'icon_mad',
'icon_mrgreen',
'icon_neutral',
'icon_question',
'icon_razz',
'icon_redface',
'icon_rolleyes',
'icon_twisted',
];
public static function depends_on(): array
{
return [
'\phpbb\db\migration\data\v400\dev'
];
}
public function update_data(): array
{
return [
['custom', [[$this, 'gif_to_svg_smilies']]],
];
}
public function revert_data(): array
{
return [
['custom', [[$this, 'svg_to_gif_smilies']]],
];
}
public function gif_to_svg_smilies(): void
{
foreach ($this->default_smilies as $smiley)
{
$sql = 'UPDATE ' . $this->tables['smilies'] . "
SET smiley_url = '" . $this->db->sql_escape($smiley) . ".svg'
WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'";
$this->db->sql_query($sql);
}
}
public function svg_to_gif_smilies(): void
{
foreach ($this->default_smilies as $smiley)
{
$sql = 'UPDATE ' . $this->tables['smilies'] . "
SET smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'
WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".svg'";
$this->db->sql_query($sql);
}
}
}

10
phpBB/phpbb/textformatter/s9e/factory.php
View File

@@ -358,15 +358,7 @@ class factory implements \phpbb\textformatter\cache_interface
// Load the Emoji plugin and modify its tag's template to obey viewsmilies
$tag = $configurator->Emoji->getTag();
$tag->template = '<xsl:choose>
<xsl:when test="@tseq">
<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@tseq}.svg"/>
</xsl:when>
<xsl:otherwise>
<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@seq}.svg"/>
</xsl:otherwise>
</xsl:choose>';
$tag->template = '<xsl:choose><xsl:when test="$S_VIEWSMILIES">' . str_replace('class="emoji"', 'class="emoji smilies"', $tag->template) . '</xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>';
$tag->template = '<span class="emoji"><xsl:value-of select="."/></span>';
/**
* Modify the s9e\TextFormatter configurator after the default settings are set