Error fixed in BaseHelper
authorRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2009 21:43:20 +0000 (21:43 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2009 21:43:20 +0000 (21:43 +0000)
inc/classes/main/helper/class_BaseHelper.php
inc/classes/main/resolver/command/class_BaseCommandResolver.php
inc/classes/main/resolver/command/web/class_WebCommandResolver.php
inc/classes/main/template/class_BaseTemplateEngine.php

index c9e9b06..0489e07 100644 (file)
@@ -441,7 +441,7 @@ class BaseHelper extends BaseFrameworkSystem {
         */
        public function getValueField ($fieldName) {
                // Get the field value
-               $fieldValue = call_user_func_array(array($this->valueInstance, 'getField'), array($fieldName));
+               $fieldValue = call_user_func_array($this->valueInstance->__toString() . '::getField', array($fieldName));
 
                // Return it
                return $fieldValue;
index fa19bbb..2d664d9 100644 (file)
@@ -99,7 +99,7 @@ class BaseCommandResolver extends BaseResolver {
                } // END - if
 
                // Create the full class name
-               $className = $this->commandPrefix . $this->convertToClassName($commandName) . 'Command';
+               $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
 
                // Now, let us create the full name of the command class
                $this->setClassName($className);
index 0e5e65d..e020350 100644 (file)
@@ -131,7 +131,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                if ($this->isCommandValid($commandName) === false) {
                        // This command is invalid!
                        throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-               }
+               } // END - if
 
                // Get the command
                $commandInstance = $this->loadCommand($commandName);
@@ -152,12 +152,6 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                // Init command instance
                $commandInstance = null;
 
-               // Create class name
-               $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
-
-               // Create command class name
-               $this->setClassName($className);
-
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
index 79981fb..e94894d 100644 (file)
@@ -1320,7 +1320,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Now parse the XML tree
                if (!xml_parse($xmlParser, $content)) {
                        // Error found in XML!
-                       //die('<pre>'.htmlentities($content).'</pre>');
+                       //* DEBUG: */ die('<pre>'.htmlentities($content).'</pre>');
                        throw new XmlParserException(array($this, $xmlParser), BaseHelper::EXCEPTION_XML_PARSER_ERROR);
                } // END - if