Version 4.1.2
This commit is contained in:
1 parent
3ba79295ee
commit
28bd025b35
1131 files changed
+63658
-20579
No files matched your search
@@ -184,12 +184,12 @@ class _Select extends FormAbstract
|
||||
{
|
||||
foreach ( $v as $x => $y )
|
||||
{
|
||||
$options[ $k ][ $x ] = htmlentities( $y, \IPS\HTMLENTITIES, 'UTF-8', FALSE );
|
||||
$options[ $k ][ $x ] = htmlspecialchars( $y, \IPS\HTMLENTITIES, 'UTF-8', FALSE );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$options[ $k ] = htmlentities( $v, \IPS\HTMLENTITIES, 'UTF-8', FALSE );
|
||||
$options[ $k ] = htmlspecialchars( $v, \IPS\HTMLENTITIES, 'UTF-8', FALSE );
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -261,6 +261,12 @@ class _Select extends FormAbstract
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* If it is not required and there is no value (pagination from table advanced search form then pass validation otherwise it throws an error) */
|
||||
if ( $this->value === NULL and ! $this->required )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
parent::validate();
|
||||
|
||||
@@ -294,4 +300,15 @@ class _Select extends FormAbstract
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* String Value
|
||||
*
|
||||
* @param mixed $value The value
|
||||
* @return string
|
||||
*/
|
||||
public static function stringValue( $value )
|
||||
{
|
||||
return parent::stringValue( $value );
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user