mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 16:45:19 +02:00
Code Issues Releases Wiki Activity

Fix bugs #487201 & #487182

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1486 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-29 21:48:08 +00:00
parent 2121f61670
commit 45ee7c56f3
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/privmsg.php
View File

@ -1270,19 +1270,20 @@ else if( $submit || $refresh || $mode != "" )
$privmsg = $db->sql_fetchrow($pm_reply_status); $privmsg = $db->sql_fetchrow($pm_reply_status);
$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject']; $privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
$to_username = $privmsg['username']; $to_username = $privmsg['username'];
$to_userid = $privmsg['user_id']; $to_userid = $privmsg['user_id'];
if( $mode == "quote" )
{
$privmsg_message = $privmsg['privmsgs_text'];
$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
$privmsg_message = str_replace("<br />", "\n", $privmsg_message); $privmsg_message = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
if( $mode == "quote" ) $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']);
{
$msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]"; $privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";

2
phpBB/profile.php
View File

@ -251,7 +251,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
if( $profiledata['user_posts'] != 0 ) if( $profiledata['user_posts'] != 0 )
{ {
$total_posts = get_db_stat("postcount"); $total_posts = get_db_stat("postcount");
$percentage = ( $total_posts ) ? sprintf("%.2f", max(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0; $percentage = ( $total_posts ) ? sprintf("%.2f", min(100, ($profiledata['user_posts'] / $total_posts) * 100)) : 0;
} }
else else
{ {