From bd947487a220add7a8d2671940822409231aa1f7 Mon Sep 17 00:00:00 2001
From: Phyks <webmaster@phyks.me>
Date: Sun, 8 Dec 2013 17:37:07 +0100
Subject: [PATCH] Fix wrong display of "whitelist" and "blacklist"

Thanks @Sbgodin for the report.
---
 adblock.plugin.disabled.php | 4 ++--
 js/adblock_plugin_js.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/adblock.plugin.disabled.php b/adblock.plugin.disabled.php
index 32f4624..c6aa64b 100755
--- a/adblock.plugin.disabled.php
+++ b/adblock.plugin.disabled.php
@@ -198,7 +198,7 @@ function adblock_plugin_setting_bloc(&$myUser) {
                             <input type="radio" name="flash_adblock_default_behavior" value="0" id="flash_adblock_allowall" onchange="adblock_whitelist_blacklist(\'adblock_flash_whitelist_blacklist\', 0);" '.((!$flash_block) ? 'checked="checked"' : '').'/><label for="flash_adblock_allowall">Allow all contents (and use a blacklist)</label>
                         </p>
 
-                        <p><span id="adblock_flash_whitelist_blacklist">'.(($flash_block) ? 'Blacklist :' : 'Whitelist :').'</span></br>
+                        <p><span id="adblock_flash_whitelist_blacklist">'.(($flash_block) ? 'Whitelist :' : 'Blacklist :').'</span></br>
                         <textarea name="flash_adblock_list" rows="7">'.$flash_list.'</textarea>
                     </div>
                 </fieldset>
@@ -222,7 +222,7 @@ function adblock_plugin_setting_bloc(&$myUser) {
                             <input type="radio" name="img_adblock_only_mobiles" value="0" id="img_adblock_only_mobiles_no" '.((!$img_only_mobiles) ? 'checked="checked"' : '').'/><label for="img_adblock_only_mobiles_no">Block images on all devices</label>
                         </p>
 
-                        <p><span id="adblock_img_whitelist_blacklist">'.(($img_block) ? 'Blacklist :' : 'Whitelist :').'</span></br>
+                        <p><span id="adblock_img_whitelist_blacklist">'.(($img_block) ? 'Whitelist :' : 'Blacklist :').'</span></br>
                         <textarea name="img_adblock_list" rows="7">'.$img_list.'</textarea>
                     </div>
                 </fieldset>
diff --git a/js/adblock_plugin_js.js b/js/adblock_plugin_js.js
index 823d68d..6d67d33 100644
--- a/js/adblock_plugin_js.js
+++ b/js/adblock_plugin_js.js
@@ -1,8 +1,8 @@
 function adblock_whitelist_blacklist(id, whitelist_blacklist) {
     if(whitelist_blacklist == 0)
-        document.getElementById(id).innerHTML = "Whitelist :";
-    else
         document.getElementById(id).innerHTML = "Blacklist :";
+    else
+        document.getElementById(id).innerHTML = "Whitelist :";
 }
 
 function adblock_unblock_img(span, url) {