diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-24 03:39:00 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-24 03:39:00 +0000 |
| commit | c6c1e67104e48322f209beee3d2e8634e05b7b78 (patch) | |
| tree | c638df123302d51e5387c856521a4b3d3a4d32a8 | |
| parent | af1b03cf2d719eece3f411f8c0a02cbfb7d5dc48 (diff) | |
| download | forums-c6c1e67104e48322f209beee3d2e8634e05b7b78.tar forums-c6c1e67104e48322f209beee3d2e8634e05b7b78.tar.gz forums-c6c1e67104e48322f209beee3d2e8634e05b7b78.tar.bz2 forums-c6c1e67104e48322f209beee3d2e8634e05b7b78.tar.xz forums-c6c1e67104e48322f209beee3d2e8634e05b7b78.zip | |
Fix global disallow sig still allows old sigs to display bug #501162
git-svn-id: file:///svn/phpbb/trunk@1933 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/privmsg.php | 19 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 3b2557d80a..07a7f873a5 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -492,7 +492,14 @@ else if( $mode == "read" ) $private_message = $privmsg['privmsgs_text']; $bbcode_uid = $privmsg['privmsgs_bbcode_uid']; - $user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig']; + if( $board_config['allow_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']; // @@ -858,7 +865,7 @@ else if( $submit || $refresh || $mode != "" ) } $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" ) { @@ -1127,14 +1134,14 @@ else if( $submit || $refresh || $mode != "" ) { $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" ) { $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" ) @@ -1154,7 +1161,7 @@ else if( $submit || $refresh || $mode != "" ) 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 { @@ -1254,7 +1261,7 @@ else if( $submit || $refresh || $mode != "" ) $privmsg_message = str_replace("<br />", "\n", $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); - $user_sig = $privmsg['user_sig']; + $user_sig = ( $board_config['allow_sig'] ) ? $privmsg['user_sig'] : ""; $to_username = $privmsg['username']; $to_userid = $privmsg['user_id']; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 61161c0da5..32b9148b0a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -983,7 +983,7 @@ for($i = 0; $i < $total_posts; $i++) $message = $postrow[$i]['post_text']; $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']; // |