diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-09-21 11:07:20 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-09-21 11:07:20 +0000 |
| commit | 8a728e1014ad0c80c14e84fb96427e703c6a805e (patch) | |
| tree | 0fcf3f743eaf716e1f25bd622aa8270014c86cbf | |
| parent | d7fe796fd9d9215f2e63534a953ee77d5114e20a (diff) | |
| download | forums-8a728e1014ad0c80c14e84fb96427e703c6a805e.tar forums-8a728e1014ad0c80c14e84fb96427e703c6a805e.tar.gz forums-8a728e1014ad0c80c14e84fb96427e703c6a805e.tar.bz2 forums-8a728e1014ad0c80c14e84fb96427e703c6a805e.tar.xz forums-8a728e1014ad0c80c14e84fb96427e703c6a805e.zip | |
System always showed 'you are banned permanently' even for temporary bans
git-svn-id: file:///svn/phpbb/trunk@5217 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index fd664edc5c..2978d0f921 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -580,6 +580,8 @@ class session else { $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(); // Determine which message to output - $till_date = (!empty($row['ban_end'])) ? $this->format_date($row['ban_end']) : ''; - $message = (!empty($row['ban_end'])) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; + $till_date = (!empty($ban_row['ban_end'])) ? $this->format_date($ban_row['ban_end']) : ''; + $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>'); // 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); } |