Conflicting getField() in BaseHelper vs. BaseFrameworkSystem fixed

diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index a40193d3d3adec9a7040f0a6eca61947b048af9e..cc829fd0ea053d00dab82c363d9deee3f77f9c6d 100644 (file)
--- a/inc/classes/main/helper/class_BaseHelper.php
+++ b/inc/classes/main/helper/class_BaseHelper.php
@@ -79,7 +79,7 @@ class BaseHelper extends BaseFrameworkSystem {
         */
        public function assignField ($fieldName) {
                // Get the value from value instance
-               $fieldValue = $this->getField($fieldName);
+               $fieldValue = $this->getValueField($fieldName);
 
                // Assign it with a template variable
                $this->getTemplateInstance()->assignVariable("block_" . $fieldName, $fieldValue);
@@ -96,7 +96,7 @@ class BaseHelper extends BaseFrameworkSystem {
         */
        public function assignFieldWithFilter ($fieldName, $filterMethod) {
                // Get the value
-               $fieldValue = $this->getField($fieldName);
+               $fieldValue = $this->getValueField($fieldName);
 
                // Now filter it through the value through the filter method
                $filteredValue = call_user_func_array(array($this, "doFilter" . ucfirst($filterMethod)), array($fieldValue));
@@ -145,7 +145,7 @@ class BaseHelper extends BaseFrameworkSystem {
         * @param       $fieldName              Name of the field we shall fetch
         * @return      $fieldValue             Value from field
         */
-       public function getField ($fieldName) {
+       public function getValueField ($fieldName) {
                // Get the field value
                $fieldValue = call_user_func_array(array($this->valueInstance, 'getField'), array($fieldName));
 

diff --git a/inc/classes/main/helper/web/class_BaseWebHelper.php b/inc/classes/main/helper/web/class_BaseWebHelper.php
index 462e8bfb87f118cdbe2ba3578149893585ce06fc..e1d5638a063ee3ac2088fa0d4b3c7405d671506c 100644 (file)
--- a/inc/classes/main/helper/web/class_BaseWebHelper.php
+++ b/inc/classes/main/helper/web/class_BaseWebHelper.php
@@ -160,7 +160,7 @@ class BaseWebHelper extends BaseHelper {
         * @return      $isUnconfirmed  Wether the user account is unconfirmed
         */
        public function ifUserAccountUnconfirmed () {
-               $isUnconfirmed = ($this->getField('user_status') === $this->getConfigInstance()->readConfig('user_status_unconfirmed'));
+               $isUnconfirmed = ($this->getValueField('user_status') === $this->getConfigInstance()->readConfig('user_status_unconfirmed'));
                return $isUnconfirmed;
        }
 
@@ -170,7 +170,7 @@ class BaseWebHelper extends BaseHelper {
         * @return      $isUnconfirmed  Wether the user account is locked
         */
        public function ifUserAccountLocked () {
-               $isUnconfirmed = ($this->getField('user_status') === $this->getConfigInstance()->readConfig('user_status_locked'));
+               $isUnconfirmed = ($this->getValueField('user_status') === $this->getConfigInstance()->readConfig('user_status_locked'));
                return $isUnconfirmed;
        }
 
@@ -180,7 +180,7 @@ class BaseWebHelper extends BaseHelper {
         * @return      $isUnconfirmed  Wether the user account is a guest
         */
        public function ifUserAccountGuest () {
-               $isUnconfirmed = ($this->getField('user_status') === $this->getConfigInstance()->readConfig('user_status_guest'));
+               $isUnconfirmed = ($this->getValueField('user_status') === $this->getConfigInstance()->readConfig('user_status_guest'));
                return $isUnconfirmed;
        }
 }

diff --git a/inc/classes/main/helper/web/forms/class_WebFormHelper.php b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
index d423448dc486a01e1b4161ebe78263ccb5568815..12c01b8d72e9acd4c6389a77c6039f3a9a1b66ed 100644 (file)
--- a/inc/classes/main/helper/web/forms/class_WebFormHelper.php
+++ b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
@@ -210,7 +210,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
         */
        public function addInputTextFieldWithDefault ($fieldName) {
                // Get the value from instance
-               $fieldValue = $this->getField($fieldName);
+               $fieldValue = $this->getValueField($fieldName);
                //* DEBUG: */ echo __METHOD__.":".$fieldName."=".$fieldValue."<br />\n";
 
                // Add the text field
@@ -278,7 +278,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
         */
        public function addInputHiddenFieldWithDefault ($fieldName) {
                // Get the value from instance
-               $fieldValue = $this->getField($fieldName);
+               $fieldValue = $this->getValueField($fieldName);
                //* DEBUG: */ echo __METHOD__.":".$fieldName."=".$fieldValue."<br />\n";
 
                // Add the text field