aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewmessage.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-03-21 23:10:11 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-03-21 23:10:11 +0000
commite4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c (patch)
tree8b687905d08d6af99c3396fa5c0470c7bbef4ccb /phpBB/includes/ucp/ucp_pm_viewmessage.php
parenta4e51c9699c7a09bea32ad832a9818abba008801 (diff)
downloadforums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.gz
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.bz2
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.xz
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.zip
- and my second attempt
git-svn-id: file:///svn/phpbb/trunk@5109 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 8fb13a18ac..217e0a646b 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -62,7 +62,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
}
// Always process smilies after parsing bbcodes
- $message = smilie_text($message);
+ $message = smiley_text($message);
// Replace naughty words such as farty pants
$message_row['message_subject'] = censor_text($message_row['message_subject']);
@@ -147,7 +147,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']);
}
- $signature = smilie_text($signature);
+ $signature = smiley_text($signature);
$signature = str_replace("\n", '<br />', censor_text($signature));
}
@@ -314,7 +314,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
}
- $message = smilie_text($message, !$row['enable_smilies']);
+ $message = smiley_text($message, !$row['enable_smilies']);
$subject = censor_text($subject);
$message = censor_text($message);
@@ -421,7 +421,7 @@ function get_user_informations($user_id, $user_row)
}
else
{
- if(isset($ranks['normal']))
+ if (isset($ranks['normal']))
{
foreach ($ranks['normal'] as $rank)
{