From f757aad8cbb7cc22bc5f2e3fe8e981496684bc15 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Sun, 12 Jan 2014 15:06:34 -0700
Subject: [PATCH] Remove mascot and theme tempfix

---
 builds/appchan-x.user.js   | 6 ------
 builds/crx/script.js       | 6 ------
 src/General/Main.coffee    | 3 ---
 src/Theming/Mascots.coffee | 2 +-
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 81a488920..c0d145731 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -17186,12 +17186,6 @@
         'CachedTitles': {}
       });
       return $.get(Conf, function(items) {
-        if (items.userMascots instanceof Array) {
-          $.set('userMascots', items.userMascots = {});
-        }
-        if (items.userThemes instanceof Array) {
-          $.set('userThemes', items.userThemes = {});
-        }
         $.extend(Conf, items);
         return Main.initFeatures();
       });
diff --git a/builds/crx/script.js b/builds/crx/script.js
index cc7d08bcc..3279b2756 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -17174,12 +17174,6 @@
         'CachedTitles': {}
       });
       return $.get(Conf, function(items) {
-        if (items.userMascots instanceof Array) {
-          $.set('userMascots', items.userMascots = {});
-        }
-        if (items.userThemes instanceof Array) {
-          $.set('userThemes', items.userThemes = {});
-        }
         $.extend(Conf, items);
         return Main.initFeatures();
       });
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 7c3747d6a..427c95136 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -43,9 +43,6 @@ Main =
       'CachedTitles':         {}
 
     $.get Conf, (items) ->
-      # TempFix for accidental declaration as an array. Remove by 2.4.?
-      $.set 'userMascots', items.userMascots = {} if items.userMascots instanceof Array
-      $.set 'userThemes',  items.userThemes  = {} if items.userThemes  instanceof Array
       $.extend Conf, items
       Main.initFeatures()
 
diff --git a/src/Theming/Mascots.coffee b/src/Theming/Mascots.coffee
index 0b9a88f2b..bdf383497 100644
--- a/src/Theming/Mascots.coffee
+++ b/src/Theming/Mascots.coffee
@@ -367,4 +367,4 @@ MascotTools =
   reposition: ->
     return unless Style.mascot
     mascot = Mascots[Conf['mascot']]
-    Style.mascot.textContent = """<%= grunt.file.read('src/General/css/mascot.css') %>"""
\ No newline at end of file
+    Style.mascot.textContent = """<%= grunt.file.read('src/General/css/mascot.css') %>"""