mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 16:05:00 +02:00
Code Issues Releases Wiki Activity

- fixed ul/li margin

Browse Source 
- 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:
Meik Sievertsen 2006-05-04 06:54:43 +00:00
parent 9a0ad16272
commit 9a9a9ff6f3
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions.php
View File

@ -1647,7 +1647,7 @@ function decode_message(&$message, $bbcode_uid = '')
'#<.*?>#s' '#<.*?>#s'
); );
$replace = array('\1', '\1', '\1', '\1', '\1', '', '&lt;\1&gt;'); $replace = array('\1', '\1', '\1', '\1', '\1', '', '');
$message = preg_replace($match, $replace, $message); $message = preg_replace($match, $replace, $message);

2
phpBB/includes/functions_user.php
View File

@ -577,7 +577,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
switch ($mode) switch ($mode)
{ {
case 'user': 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; break;
case 'ip': case 'ip':

2
phpBB/includes/message_parser.php
View File

@ -288,7 +288,7 @@ class bbcode_firstpass extends bbcode
'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
'#&\#([0-9]+);#', '#&\#([0-9]+);#',
); );
$htm_replace = array('\1', '\1', '\1', '\1', '\1', '&lt;\1&gt;', '&amp;#\1;'); $htm_replace = array('\1', '\1', '\1', '\1', '\1', '&amp;#\1;');
$out = ''; $out = '';

2
phpBB/includes/session.php
View File

@ -723,7 +723,7 @@ class session
* *
* Checks whether the supplied user is banned by id, ip or email. If no parameters * Checks whether the supplied user is banned by id, ip or email. If no parameters
* are passed to the method pre-existing session data is used. If $return is false * are passed to the method pre-existing session data is used. If $return is false
* this routine does not return on finding a banned user , it outputs a relevant * this routine does not return on finding a banned user, it outputs a relevant
* message and stops execution. * message and stops execution.
*/ */
function check_ban($user_id = false, $user_ip = false, $user_email = false, $return = false) function check_ban($user_id = false, $user_ip = false, $user_email = false, $return = false)

4
phpBB/styles/subSilver/theme/stylesheet.css
View File

@ -35,6 +35,10 @@ body {
margin: 0; margin: 0;
} }
ul, li {
margin-left: 20px;
}
#wrapheader { #wrapheader {
height: 120px; height: 120px;
background-image: url('./images/background.gif'); background-image: url('./images/background.gif');