get rid of undefined $ error by mangling theme specific JS include order

4 files changed, 22 insertions, 19 deletions

diff --git a/index.php b/index.php
index 719e1ef8c..a4e8899d9 100644
--- a/index.php
+++ b/index.php
@@ -346,6 +346,9 @@ if($a->module != 'install') {
 
 require_once(theme_include('theme_init.php'));
 
+if(($p = theme_include(current_theme() . '.js')) != '')
+	head_add_js($p);
+
 if(($p = theme_include('mod_' . $a->module . '.php')) != '')
 	require_once($p);
 
diff --git a/js/main.js b/js/main.js
index 116cd5aeb..e9ff2fc88 100644
--- a/js/main.js
+++ b/js/main.js
@@ -870,6 +870,23 @@ $("abbr.wall-item-ago-time").timeago();
 //reCalcHeight();
 
 
+
+
+
+});
+
+	function zFormError(elm,x) {
+		if(x) {
+			$(elm).addClass("zform-error");
+			$(elm).removeClass("zform-ok");
+		}
+		else {
+			$(elm).addClass("zform-ok");
+			$(elm).removeClass("zform-error");
+		}											
+	}
+
+
 $(window).scroll(function () {                 
 	if(typeof buildCmd == 'function') {
 		$('#more').hide();                 
@@ -893,19 +910,3 @@ $(window).scroll(function () {
 });
 
 
-
-
-
-});
-
-	function zFormError(elm,x) {
-		if(x) {
-			$(elm).addClass("zform-error");
-			$(elm).removeClass("zform-ok");
-		}
-		else {
-			$(elm).addClass("zform-ok");
-			$(elm).removeClass("zform-error");
-		}											
-	}
-
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 4703022ec..68d6e4cd1 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -9,8 +9,6 @@ head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
 head_add_css('library/jslider/bin/jquery.slider.min.css');
 
-
-
 head_add_js('js/jquery.js');
 head_add_js('js/jquery.textinputs.js');
 head_add_js('js/fk.autocomplete.js');
@@ -25,3 +23,4 @@ head_add_js('js/acl.js');
 head_add_js('js/webtoolkit.base64.js');
 head_add_js('js/main.js');
 head_add_js('library/jslider/bin/jquery.slider.min.js');
+head_add_js('docready.js');
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 19e3db35f..47e1df5d1 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,5 +1,5 @@
 <?php
 
 function redbasic_init(&$a) {
-	head_add_js('redbasic.js');
+//	head_add_js('redbasic.js');
 }