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

Fix global disallow sig still allows old sigs to display bug #501162

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1933 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-01-24 03:39:00 +00:00
parent af1b03cf2d
commit c6c1e67104
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/privmsg.php
View file

@ -492,7 +492,14 @@ else if( $mode == "read" )
$private_message = $privmsg['privmsgs_text']; $private_message = $privmsg['privmsgs_text'];
$bbcode_uid = $privmsg['privmsgs_bbcode_uid']; $bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
if( $board_config['allow_sig'] )
{
$user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig']; $user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig'];
}
else
{
$user_sig = "";
}
$user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid']; $user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid'];
// //
@ -858,7 +865,7 @@ else if( $submit || $refresh || $mode != "" )
} }
$attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig'];
$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
if( $submit && $mode != "edit" ) if( $submit && $mode != "edit" )
{ {
@ -1127,14 +1134,14 @@ else if( $submit || $refresh || $mode != "" )
{ {
$page_title = $lang['Send_new_privmsg']; $page_title = $lang['Send_new_privmsg'];
$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
} }
else if( $mode == "reply" ) else if( $mode == "reply" )
{ {
$page_title = $lang['Reply_privmsg']; $page_title = $lang['Reply_privmsg'];
$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
} }
else if( $mode == "edit" ) else if( $mode == "edit" )
@ -1154,7 +1161,7 @@ else if( $submit || $refresh || $mode != "" )
message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']); message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']);
} }
$user_sig = ( $postrow['user_sig'] != "" ) ? $postrow['user_sig'] : ""; $user_sig = ( $postrow['user_sig'] != "" && $board_config['allow_sig'] ) ? $postrow['user_sig'] : "";
} }
else else
{ {
@ -1254,7 +1261,7 @@ else if( $submit || $refresh || $mode != "" )
$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);
$user_sig = $privmsg['user_sig']; $user_sig = ( $board_config['allow_sig'] ) ? $privmsg['user_sig'] : "";
$to_username = $privmsg['username']; $to_username = $privmsg['username'];
$to_userid = $privmsg['user_id']; $to_userid = $privmsg['user_id'];

2
phpBB/viewtopic.php
View file

@ -983,7 +983,7 @@ for($i = 0; $i < $total_posts; $i++)
$message = $postrow[$i]['post_text']; $message = $postrow[$i]['post_text'];
$bbcode_uid = $postrow[$i]['bbcode_uid']; $bbcode_uid = $postrow[$i]['bbcode_uid'];
$user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != "" ) ? $postrow[$i]['user_sig'] : ""; $user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != "" && $board_config['allow_sig'] ) ? $postrow[$i]['user_sig'] : "";
$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid']; $user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];
// //