mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-10 17:45:18 +02:00
System always showed 'you are banned permanently' even for temporary bans
git-svn-id: file:///svn/phpbb/trunk@5217 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
d7fe796fd9
commit
8a728e1014
@ -580,6 +580,8 @@ class session
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
$banned = true;
|
$banned = true;
|
||||||
|
$ban_row = $row;
|
||||||
|
// Don't break. Check if there is an exclude rule for this user
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -593,12 +595,13 @@ class session
|
|||||||
$this->setup();
|
$this->setup();
|
||||||
|
|
||||||
// Determine which message to output
|
// Determine which message to output
|
||||||
$till_date = (!empty($row['ban_end'])) ? $this->format_date($row['ban_end']) : '';
|
$till_date = (!empty($ban_row['ban_end'])) ? $this->format_date($ban_row['ban_end']) : '';
|
||||||
$message = (!empty($row['ban_end'])) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
|
$message = (!empty($ban_row['ban_end'])) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
|
||||||
|
|
||||||
$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>');
|
$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>');
|
||||||
// More internal HTML ...
|
// More internal HTML ...
|
||||||
$message .= (!empty($row['ban_show_reason'])) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $row['ban_show_reason']) : '';
|
// TODO: 'ban_show_reason' isn't used in the admin yet.
|
||||||
|
$message .= (!empty($ban_row['ban_show_reason'])) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_show_reason']) : '';
|
||||||
trigger_error($message);
|
trigger_error($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user