Version 4.5.0

system/Helpers/Form/Translatable.php

@@ -11,7 +11,7 @@
 namespace IPS\Helpers\Form;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -49,15 +49,21 @@ class _Translatable extends FormAbstract
 	
 	/**
 	 * Constructor
-	 * Sets that the field is required if there is a minimum length and vice-versa
 	 *
-	 * @see		\IPS\Helpers\Form\FormAbstract::__construct
+	 * @param	string			$name					Name
+	 * @param	mixed			$defaultValue			Default value
+	 * @param	bool|NULL		$required				Required? (NULL for not required, but appears to be so)
+	 * @param	array			$options				Type-specific options
+	 * @param	callback		$customValidationCode	Custom validation code
+	 * @param	string			$prefix					HTML to show before input field
+	 * @param	string			$suffix					HTML to show after input field
+	 * @param	string			$id						The ID to add to the row
 	 * @return	void
 	 */
-	public function __construct()
+	public function __construct( $name, $defaultValue=NULL, $required=FALSE, $options=array(), $customValidationCode=NULL, $prefix=NULL, $suffix=NULL, $id=NULL )
 	{
 		/* Call parent constructor */
-		call_user_func_array( 'parent::__construct', func_get_args() );
+		parent::__construct( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
 		
 		/* Get current values */
 		if ( $this->value === NULL )
@@ -70,7 +76,7 @@ class _Translatable extends FormAbstract
 					$v = $v['word_custom'] ?: $v['word_default'];
 					if ( $v or !isset( $values[ $k ] ) )
 					{
-						if ( is_array( $this->options['sprintf'] ) )
+						if ( \is_array( $this->options['sprintf'] ) )
 						{
 							$values[ $k ] = vsprintf( $v, $this->options['sprintf'] );
 						}
@@ -84,7 +90,7 @@ class _Translatable extends FormAbstract
 			
 			$this->value = $values;
 		}
-		elseif ( is_string( $this->value ) )
+		elseif ( \is_string( $this->value ) )
 		{
 			$values = array();
 			foreach ( \IPS\Lang::getEnabledLanguages() as $lang )