X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fhelper%2Fclass_BaseHelper.php;h=5cd4ea88b0247d3f567f4185d6408e093f064b0c;hp=da4f6b12b3f0fffe558ac1d0ab99c5c4539b341b;hb=1dfce1c5d3a9102021322559085bd69f49c981cc;hpb=eb7f95605a457b70446885631e03db5d5778b80c

diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index da4f6b12..5cd4ea88 100644
--- a/inc/classes/main/helper/class_BaseHelper.php
+++ b/inc/classes/main/helper/class_BaseHelper.php
@@ -438,15 +438,17 @@ class BaseHelper extends BaseFrameworkSystem {
 	 *
 	 * @param	$fieldName		Name of the field we shall fetch
 	 * @return	$fieldValue		Value from field
+	 * @throws	NullPointerException	Thrown if $valueInstance is null
 	 */
 	public function getValueField ($fieldName) {
-		// Construct the eval() command
-		$eval = sprintf("\$fieldValue = \$this->getValueInstance()->getField('%s');",
-			$fieldName
-		);
+		// The $valueInstance attribute should not be null!
+		if (is_null($this->getValueInstance())) {
+			// Throws an exception here
+			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+		} // END - if
 
 		// Get the field value
-		eval($eval);
+		$fieldValue = $this->getValueInstance()->getField($fieldName);
 
 		// Return it
 		return $fieldValue;