Fixes #5093 - True/False labels on <select> options.

e107inc · Nov 1, 2023 · faa2f8a · faa2f8a
1 parent fb98771
commit faa2f8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
@@ -3597,10 +3597,11 @@ public function option($option_title, $value, $selected = false, $options = '')
 
 		$options = $this->format_options('option', '', $options);
 		$options['selected'] = $selected; //comes as separate argument just for convenience
-
+		$ltitle = strtolower($option_title);
+		$label = ($ltitle === 'true' || $ltitle === 'false') ? $option_title : defset($option_title, $option_title);
 
 		return "<option" . $this->attributes(['value' => $value]) . $this->get_attributes($options) . '>'
-			. defset($option_title, $option_title) .
+			. $label .
 			'</option>';
 	}
 

diff --git a/e107_tests/tests/unit/e_formTest.php b/e107_tests/tests/unit/e_formTest.php
@@ -779,6 +779,14 @@ public function testOption()
 
 		$this->assertEquals($expected, $actual);
 
+		$tests = ['true'=>'True', 'false'=>'False', 'legacy'=>'Legacy'];
+
+		foreach($tests as $k=>$v)
+		{
+			$expected = "<option value='$k'>$v</option>";
+			$result = $this->_frm->option($v,$k);
+			$this->assertSame($expected, $result);
+		}
 	}
 
 	public function testOption_multi()