2 files changed, 20 insertions, 24 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 70bc703582..649a384418 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,17 +2,6 @@
 
 "use strict";
 
-/**
-* Close popup alert after a specified delay
-*
-* @param int Delay in ms until darkenwrapper's click event is triggered
-*/
-phpbb.closeDarkenWrapper = function(delay) {
-	phpbbAlertTimer = setTimeout(function() {
-		$('#darkenwrapper').trigger('click');
-	}, delay);
-};
-
 // This callback will mark all forum icons read
 phpbb.addAjaxCallback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
index 9504d16284..5a7eaa7840 100644
--- a/phpBB/styles/prosilver/template/mcp_ban.html
+++ b/phpBB/styles/prosilver/template/mcp_ban.html
@@ -5,27 +5,34 @@
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
+
+	<!-- BEGIN bans -->
+		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
+		<!-- IF bans.A_REASON -->
+			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
+		<!-- ENDIF -->
+		<!-- IF bans.A_GIVE_REASON -->
+			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
+		<!-- ENDIF -->
+	<!-- END bans -->
 
 	function display_details(option)
 	{
-		document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
-		document.getElementById('unbanreason').innerHTML = ban_reason[option];
 		document.getElementById('unbanlength').innerHTML = ban_length[option];
+		if (option in ban_reason) {
+			document.getElementById('unbanreason').innerHTML = ban_reason[option];
+		} else {
+			document.getElementById('unbanreason').innerHTML = '';
+		}
+		if (option in ban_give_reason) {
+			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
+		} else {
+			document.getElementById('unbangivereason').innerHTML = '';
+		}
 	}
 
 // ]]>