makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hurray the smilies code appears to work :)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@883 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
the_systech 2001-08-15 15:51:02 +00:00
parent a9e82a381d
commit 0f21ea1e90
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions.php
View file

@ -777,8 +777,9 @@ function smilies_pass($message)
if(empty($smilies)) if(empty($smilies))
{ {
$sql = "SELECT code, smile_url $sql = "SELECT code, smile_url, LENGTH(code) as length
FROM " . SMILIES_TABLE; FROM " . SMILIES_TABLE . "
ORDER BY length DESC";
if($result = $db->sql_query($sql)) if($result = $db->sql_query($sql))
{ {
$smilies = $db->sql_fetchrowset($result); $smilies = $db->sql_fetchrowset($result);
@ -787,7 +788,7 @@ function smilies_pass($message)
for($i = 0; $i < count($smilies); $i++) for($i = 0; $i < count($smilies); $i++)
{ {
$orig[] = "'\B" . preg_quote($smilies[$i]['code']) . "\B'sxi"; $orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '">'; $repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '">';
} }