Fixed issue #06165: unable to implement affirmative exclusive non-ans…

…wer in array_filter_exclude Fixed issue #06079: sub-question filtering broken if "other" or "no answer" option is given Dev Array_filter and array_filter_exclude now handle mismatched lists of sub-questions gracefully. Values in list B that are not in list A will not be filtered, and will not throw errors. Dev This lets authors support exclusive options like "none of the above" in array filtered questions
LimeSurvey · Jun 3, 2012 · a2b96ed · a2b96ed
1 parent 29a8e28
commit a2b96ed
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -1038,23 +1038,39 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                                         foreach ($cascadedAF as $_caf)
                                         {
                                             $sgq = ((isset($this->qcode2sgq[$_caf])) ? $this->qcode2sgq[$_caf] : $_caf);
-                                            $af_names[] = $sgq . substr($sq['sqsuffix'],1);;
+                                            $sgq .= substr($sq['sqsuffix'],1);
+                                            if (isset($this->knownVars[$sgq]))
+                                            {
+                                                $af_names[] = $sgq . '.NAOK';
+                                            }
                                         }
                                         foreach ($cascadedAFE as $_cafe)
                                         {
                                             $sgq = ((isset($this->qcode2sgq[$_cafe])) ? $this->qcode2sgq[$_cafe] : $_cafe);
-                                            $afe_names[] = $sgq . substr($sq['sqsuffix'],1);;
+                                            $sgq .= substr($sq['sqsuffix'],1);
+                                            if (isset($this->knownVars[$sgq]))
+                                            {
+                                                $afe_names[] = $sgq . '.NAOK';
+                                            }
                                         }
                                     }
                                     else
                                     {
                                         foreach ($cascadedAF as $_caf)
                                         {
-                                            $af_names[] = $_caf . $sq['sqsuffix'];
+                                            $sgq = $_caf . $sq['sqsuffix'];
+                                            if (isset($this->knownVars[$sgq]))
+                                            {
+                                                $af_names[] = $sgq . '.NAOK';
+                                            }
                                         }
                                         foreach ($cascadedAFE as $_cafe)
                                         {
-                                            $afe_names[] = $_cafe . $sq['sqsuffix'];
+                                            $sgq = $_cafe . $sq['sqsuffix'];
+                                            if (isset($this->knownVars[$sgq]))
+                                            {
+                                                $afe_names[] = $sgq . '.NAOK';
+                                            }
                                         }
                                     }
                                     break;