mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-11 01:55:24 +02:00
addition for sorting smiley codes so that they all work properly on all DBMS's
The smiley functions should probably be moved to bbcode.php at some point git-svn-id: file:///svn/phpbb/trunk@937 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f844ff63a6
commit
fac05e46a9
@ -820,6 +820,11 @@ function tz_select($default)
|
|||||||
// Smilies code ... would this be better tagged
|
// Smilies code ... would this be better tagged
|
||||||
// on to the end of bbcode.php?
|
// on to the end of bbcode.php?
|
||||||
//
|
//
|
||||||
|
// Probably so and I'll move it before B2
|
||||||
|
// The_Systech
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
function smilies_pass($message)
|
function smilies_pass($message)
|
||||||
{
|
{
|
||||||
global $db, $board_config;
|
global $db, $board_config;
|
||||||
@ -834,7 +839,7 @@ function smilies_pass($message)
|
|||||||
$smilies = $db->sql_fetchrowset($result);
|
$smilies = $db->sql_fetchrowset($result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
usort($smilies, 'smiley_sort');
|
||||||
for($i = 0; $i < count($smilies); $i++)
|
for($i = 0; $i < count($smilies); $i++)
|
||||||
{
|
{
|
||||||
$orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
|
$orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
|
||||||
@ -848,5 +853,12 @@ function smilies_pass($message)
|
|||||||
}
|
}
|
||||||
return($message);
|
return($message);
|
||||||
}
|
}
|
||||||
|
function smiley_sort($a, $b)
|
||||||
|
{
|
||||||
|
if (strlen($a['code']) == strlen($b['code']))
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return (strlen($a['code']) > strlen($b['code'])) ? -1 : 1;
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user