mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 19:24:01 +02:00
- modcp bugfix (empty topic/forum id)
- fix user signature problems (html globally turned off/on) git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5099 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -563,9 +563,9 @@ else if ( $mode == 'read' )
|
||||
// If the board has HTML off but the post has HTML
|
||||
// on then we process it, else leave it alone
|
||||
//
|
||||
if ( !$board_config['allow_html'] )
|
||||
if ( !$board_config['allow_html'] || !$userdata['user_allowhtml'])
|
||||
{
|
||||
if ( $user_sig != '' && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] )
|
||||
if ( $user_sig != '')
|
||||
{
|
||||
$user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig);
|
||||
}
|
||||
@@ -1528,9 +1528,9 @@ else if ( $submit || $refresh || $mode != '' )
|
||||
//
|
||||
// Finalise processing as per viewtopic
|
||||
//
|
||||
if ( !$html_on )
|
||||
if ( !$html_on || !$board_config['allow_html'] || !$userdata['user_allowhtml'] )
|
||||
{
|
||||
if ( $user_sig != '' || !$userdata['user_allowhtml'] )
|
||||
if ( $user_sig != '' )
|
||||
{
|
||||
$user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig);
|
||||
}
|
||||
|
Reference in New Issue
Block a user