Enable compatibility to PHP 5.4

olafgleba · Mar 29, 2013 · efc6cb4 · efc6cb4
1 parent 433e138
commit efc6cb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/welcompose/core/content_classes/generatorformfield.class.php b/welcompose/core/content_classes/generatorformfield.class.php
@@ -532,7 +532,7 @@ public function getTypeListForForm ()
  * @param array Attributes reference
  * @return array
  */
-public function prepareOptionalAttributes ($params = array(), $field_ref, $attribute_ref)
+public function prepareOptionalAttributes ($params = array(), &$field_ref, &$attribute_ref)
 {
 
 	// input check

diff --git a/welcompose/core/display_classes/generatorformindex.class.php b/welcompose/core/display_classes/generatorformindex.class.php
@@ -215,7 +215,7 @@ public function render ()
 					$declare_attributes = array(
 						'required_attr', 'autofocus'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -234,7 +234,7 @@ public function render ()
 					$declare_attributes = array(
 						'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -252,7 +252,7 @@ public function render ()
 					$declare_attributes = array(
 						'required_attr', 'autofocus'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -279,7 +279,7 @@ public function render ()
 					$declare_attributes = array(
 						'min', 'max', 'step', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -306,7 +306,7 @@ public function render ()
 						$declare_attributes = array(
 							'required_attr', 'autofocus'
 						);
-						$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);						
+						$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);						
 						// prepare data
 						$data = array(
 							'label' => $_field['label'],
@@ -328,7 +328,7 @@ public function render ()
 					$declare_attributes = array(
 						'min', 'max', 'step', 'autofocus'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -358,7 +358,7 @@ public function render ()
 					$declare_attributes = array(
 						'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -376,7 +376,7 @@ public function render ()
 					$declare_attributes = array(
 						'required_attr','autofocus'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);
 					// prepare values
 					$values = array();
 					foreach (explode(',', $_field['value']) as $_value) {
@@ -412,7 +412,7 @@ public function render ()
 					$declare_attributes = array(
 						'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -432,7 +432,7 @@ public function render ()
 					$declare_attributes = array(
 						'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -453,7 +453,7 @@ public function render ()
 				$declare_attributes = array(
 					'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 				);
-				$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);	
+				$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);	
 					// prepare label
 					$data = array(
 						'label' => $_field['label']
@@ -473,7 +473,7 @@ public function render ()
 					$declare_attributes = array(
 						'placeholder', 'pattern', 'maxlength', 'required_attr', 'autofocus', 'readonly'
 					);
-					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, &$_field, &$attributes);					
+					$GENERATORFORMFIELDS->prepareOptionalAttributes($declare_attributes, $_field, $attributes);					
 					// prepare data
 					$data = array(
 						'label' => $_field['label']
@@ -497,6 +497,9 @@ public function render ()
 			$element->addRule('regex', $_field['validator_message'], $field_regex);
 		}
 
+		// init var
+		$elements = array();
+
 		// collect values
 		if ($FORM->isSubmitted()) {
 			foreach ($FORM->getElementsByName($_field['name']) as $element_field_name) {