Merge branch 'master' into 192_dev

TMSWhite · May 16, 2012 · 4c5495c · 4c5495c
2 parents ebaaccc + 3c22b33
commit 4c5495c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/admin/scripts/subquestions.js b/admin/scripts/subquestions.js
@@ -1,6 +1,9 @@
 // $Id: subquestions.js 12442 2012-02-11 00:07:00Z shnoulle $
 var labelcache=[];
 $(document).ready(function(){
+    $("body").delegate(".code", "keyup", function() {
+        $(this).val($(this).val().replace(/[^a-zA-Z0-9_]/,''));
+    });
     $('.tab-page:first .answertable tbody').sortable({   containment:'parent',
         start:startmove,
         update:aftermove,

diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
@@ -1217,8 +1217,8 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                 // exclude_all_others_auto
                 // if (count(this.relevanceStatus) == count(this)) { set exclusive option value to "Y" and call checkconditions() }
                 // However, note that would need to blank the values, not use relevance, otherwise can't unclick the _auto option without having it re-enable itself
-                if (isset($qattr['exclude_all_others_auto']) && trim($qattr['exclude_all_others_auto']) != ''
-                        && isset($qattr['exclude_all_others']) && count(explode(';',trim($qattr['exclude_all_others']))) == 1)
+                if (isset($qattr['exclude_all_others_auto']) && trim($qattr['exclude_all_others_auto']) == '1'
+                        && isset($qattr['exclude_all_others']) && trim($qattr['exclude_all_others']) != '' && count(explode(';',trim($qattr['exclude_all_others']))) == 1)
                 {
                     $exclusive_option = trim($qattr['exclude_all_others']);
                     if ($hasSubqs) {