Index: includes/acp/acp_ban.php
===================================================================
--- includes/acp/acp_ban.php	(revision 9713)
+++ includes/acp/acp_ban.php	(working copy)
@@ -181,7 +181,21 @@
 			$banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
 
 			$time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
-			$ban_length[$row['ban_id']] = (isset($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['UNTIL'] . ' -> ' . $user->format_date($row['ban_end']);
+			if($time_length == 0)
+			{
+				//permanent ban
+				$ban_length[$row['ban_id']] = $user->lang['PERMANENT'];
+			}
+			elseif(isset($ban_end_text[$time_length]))
+			{
+				//banned for a given duration
+				$ban_length[$row['ban_id']] = $ban_end_text[$time_length] . ' (' . $user->lang['UNTIL'] . ' ' . $user->format_date($row['ban_end']) . ')';
+			}
+			else
+			{
+				//banned until a given date
+				$ban_length[$row['ban_id']] = $user->lang['UNTIL'] . ' -> ' . $user->format_date($row['ban_end']);
+			}
 
 			$ban_reasons[$row['ban_id']] = $row['ban_reason'];
 			$ban_give_reasons[$row['ban_id']] = $row['ban_give_reason'];