Now with getter

[core.git] / inc / classes / main / helper / class_BaseHelper.php

diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index c79ccf14b82907ff25ee3dae3397ed611a4f5fdd..da4f6b12b3f0fffe558ac1d0ab99c5c4539b341b 100644 (file)
--- a/inc/classes/main/helper/class_BaseHelper.php
+++ b/inc/classes/main/helper/class_BaseHelper.php
@@ -190,8 +190,13 @@ class BaseHelper extends BaseFrameworkSystem {
         * @throws      NullPointerException    If recovery of requested value instance failed
         */
        public function prefetchValueInstance ($registryKey, $extraKey = null) {
-               // Get the required instance
-               $this->valueInstance = Registry::getRegistry()->getInstance($registryKey);
+               try {
+                       // Get the required instance
+                       $this->valueInstance = Registry::getRegistry()->getInstance($registryKey);
+               } catch (NullPointerException $e) {
+                       // Not set in registry
+                       // @TODO Try to log it here
+               }
 
                // Is the value instance valid?
                if (is_null($this->valueInstance)) {
@@ -204,10 +209,9 @@ class BaseHelper extends BaseFrameworkSystem {
                                $extraInstance = Registry::getRegistry()->getInstance($extraKey);
                        } // END - if
 
-                       // Get the requested instance
                        try {
+                               // Get the requested instance
                                $this->valueInstance = ObjectFactory::createObjectByConfiguredName($registryKey . '_class', array($extraInstance));
-
                        } catch (FrameworkException $e) {
                                // Okay, nothing found so throw a null pointer exception here
                                throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
@@ -436,8 +440,13 @@ class BaseHelper extends BaseFrameworkSystem {
         * @return      $fieldValue             Value from field
         */
        public function getValueField ($fieldName) {
+               // Construct the eval() command
+               $eval = sprintf("\$fieldValue = \$this->getValueInstance()->getField('%s');",
+                       $fieldName
+               );
+
                // Get the field value
-               $fieldValue = call_user_func_array(array($this->valueInstance, 'getField'), array($fieldName));
+               eval($eval);
 
                // Return it
                return $fieldValue;