From ec74e82d5cd55c7c080177a76055d4fe0da38909 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 16 May 2007 20:32:01 +0000
Subject: [PATCH] MDL-9618 Form remove option logic is incorrect - patch by
 Mark Nielsen; merged from MOODLE_18_STABLE

---
 lib/form/select.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/select.php b/lib/form/select.php
index e96d1f2216..95a1fb4fe4 100644
--- 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){
-- 
2.39.5