MDL-9618 Form remove option logic is incorrect - patch by Mark Nielsen; merged from...

diff --git a/lib/form/select.php b/lib/form/select.php
index e96d1f221601dc6379e805f9475cb9547ccb1da8..95a1fb4fe40d802e60ce266ad559bbcdd3f65340 100644 (file)
--- a/lib/form/select.php
+++ b/lib/form/select.php
@@ -86,7 +86,7 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{
     function removeOption($value)
     {
         $key=array_search($value, $this->_values);
-        if ($key!==FALSE || $key!==null) {
+        if ($key!==FALSE and $key!==null) {
             unset($this->_values[$key]);
         }
         foreach ($this->_options as $key=>$option){