diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 21:48:08 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 21:48:08 +0000 |
| commit | 45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df (patch) | |
| tree | c375c9b749a68cb217c53f137866b25ccb73916b /phpBB | |
| parent | 2121f61670e9464e448d39b2fa2f0436b118e45f (diff) | |
| download | forums-45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df.tar forums-45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df.tar.gz forums-45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df.tar.bz2 forums-45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df.tar.xz forums-45ee7c56f3e92eac8000642d4cb7aeaf8b5b13df.zip | |
Fix bugs #487201 & #487182
git-svn-id: file:///svn/phpbb/trunk@1486 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/privmsg.php | 15 | ||||
| -rw-r--r-- | phpBB/profile.php | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 721339c28f..2134696d3a 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -1270,19 +1270,20 @@ else if( $submit || $refresh || $mode != "" ) $privmsg = $db->sql_fetchrow($pm_reply_status); $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_userid = $privmsg['user_id']; - $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); - $privmsg_message = str_replace("<br />", "\n", $privmsg_message); - $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); - if( $mode == "quote" ) { - $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]"; + $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 = str_replace("<br />", "\n", $privmsg_message); + $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); + + $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); $privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]"; diff --git a/phpBB/profile.php b/phpBB/profile.php index d95dc1f991..58fe28e233 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -251,7 +251,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) if( $profiledata['user_posts'] != 0 ) { $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 { |