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

Oops, another file I forgot to commit, perhaps I should commit myself ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1617 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-12-17 00:46:54 +00:00
parent 699a4ccaad
commit 4201b9af2a
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions.php
View file

@ -837,11 +837,19 @@ function smilies_pass($message)
{ {
$sql = "SELECT code, smile_url $sql = "SELECT code, smile_url
FROM " . SMILIES_TABLE; FROM " . SMILIES_TABLE;
if($result = $db->sql_query($sql)) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
}
if( !$db->sql_numrows($result) )
{
return $message;
}
$smilies = $db->sql_fetchrowset($result); $smilies = $db->sql_fetchrowset($result);
} }
}
usort($smilies, 'smiley_sort'); usort($smilies, 'smiley_sort');
for($i = 0; $i < count($smilies); $i++) for($i = 0; $i < count($smilies); $i++)
{ {
@ -854,7 +862,8 @@ function smilies_pass($message)
$message = preg_replace($orig, $repl, ' ' . $message . ' '); $message = preg_replace($orig, $repl, ' ' . $message . ' ');
$message = substr($message, 1, -1); $message = substr($message, 1, -1);
} }
return($message);
return $message;
} }
function smiley_sort($a, $b) function smiley_sort($a, $b)
{ {
@ -862,6 +871,7 @@ function smiley_sort($a, $b)
{ {
return 0; return 0;
} }
return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1; return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1;
} }