mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 15:05:43 +02:00
- fixed ul/li margin
- fixed [code=php] tag (tags got mangled on edit) - fixed a tiny issue within the ban function git-svn-id: file:///svn/phpbb/trunk@5875 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
9a0ad16272
commit
9a9a9ff6f3
@ -1647,7 +1647,7 @@ function decode_message(&$message, $bbcode_uid = '')
|
||||
'#<.*?>#s'
|
||||
);
|
||||
|
||||
$replace = array('\1', '\1', '\1', '\1', '\1', '', '<\1>');
|
||||
$replace = array('\1', '\1', '\1', '\1', '\1', '', '');
|
||||
|
||||
$message = preg_replace($match, $replace, $message);
|
||||
|
||||
|
@ -577,7 +577,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
|
||||
switch ($mode)
|
||||
{
|
||||
case 'user':
|
||||
$sql_where = 'WHERE session_user_id IN (' . implode(', ', $banlist_ary) . ')';
|
||||
$sql_where = (in_array('*', $banlist_ary)) ? '' : 'WHERE session_user_id IN (' . implode(', ', $banlist_ary) . ')';
|
||||
break;
|
||||
|
||||
case 'ip':
|
||||
|
@ -288,7 +288,7 @@ class bbcode_firstpass extends bbcode
|
||||
'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
|
||||
'#&\#([0-9]+);#',
|
||||
);
|
||||
$htm_replace = array('\1', '\1', '\1', '\1', '\1', '<\1>', '&#\1;');
|
||||
$htm_replace = array('\1', '\1', '\1', '\1', '\1', '&#\1;');
|
||||
|
||||
$out = '';
|
||||
|
||||
|
@ -35,6 +35,10 @@ body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
ul, li {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
#wrapheader {
|
||||
height: 120px;
|
||||
background-image: url('./images/background.gif');
|
||||
|
Loading…
x
Reference in New Issue
Block a user