Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Megan Watson
2 parents d41d62a4 3a00ca15
Showing 2 changed files with 6 additions and 4 deletions
setup/wizard/resources/wizard.js
setup/wizard/steps/dependencies.php
@@ -61,12 +61,13 @@ wizard.prototype.toggleElement = function(el) {
 	w.hideErrors(); // If theres no errors, hide the ones displaying
 	var el = document.getElementsByClassName("step"+p);
 	el[0].style.display = 'none';
+	var j = 0;
 	if(d == "n") {
-		var j = p+1;
+		j = p+1;
 	} else if(d == "p") {
-		var j = p-1;
+		j = p-1;
 	}
-	var el = document.getElementsByClassName("step"+j);
+	el = document.getElementsByClassName("step"+j);
 	el[0].style.display = 'block';
  
 	return true;
@@ -148,4 +149,5 @@ wizard.prototype.onSubmitValidate = function() {
 			return false;
 		}
 	}
+	return true;
 }
 \ No newline at end of file
@@ -323,7 +323,7 @@ class dependencies extends Step
     	if(WINDOWS_OS) {
 	        return $ext;
     	} else {
-    		unset($ext['extension']['win32']);
+    		unset($ext[5]);
 	        return $ext;
     	}
     }