From d9f03cd847ac073e31b64f5e8d1da8912c160c0b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 29 Jun 2008 10:11:45 +0000
Subject: [PATCH] Conflicting getField() in BaseHelper vs. BaseFrameworkSystem
 fixed

---
 inc/classes/main/helper/class_BaseHelper.php              | 6 +++---
 inc/classes/main/helper/web/class_BaseWebHelper.php       | 6 +++---
 inc/classes/main/helper/web/forms/class_WebFormHelper.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index a40193d..cc829fd 100644
--- 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 462e8bf..e1d5638 100644
--- 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 d423448..12c01b8 100644
--- 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
-- 
2.39.5