Error fixed in BaseHelper

diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index c9e9b068e1f3220aaf3bced08f8fca0ab54c4d22..0489e073b5c246b57eb539040413ee9ffb6acefc 100644 (file)
--- a/inc/classes/main/helper/class_BaseHelper.php
+++ b/inc/classes/main/helper/class_BaseHelper.php
@@ -441,7 +441,7 @@ class BaseHelper extends BaseFrameworkSystem {
         */
        public function getValueField ($fieldName) {
                // Get the field value
         */
        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;
 
                // Return it
                return $fieldValue;

diff --git a/inc/classes/main/resolver/command/class_BaseCommandResolver.php b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
index fa19bbb5e459c4b16ddea46ac6d4567c7326869d..2d664d9600a5b1d2f71c180adf72ee71da5f021c 100644 (file)
--- a/inc/classes/main/resolver/command/class_BaseCommandResolver.php
+++ b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
@@ -99,7 +99,7 @@ class BaseCommandResolver extends BaseResolver {
                } // END - if
 
                // Create the full class name
                } // 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);
 
                // Now, let us create the full name of the command class
                $this->setClassName($className);

diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index 0e5e65de018edc51e0e6c4d1a0b161065241de76..e020350d254f0c15a3df50ecc82fbf6c3aefb2c3 100644 (file)
--- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@ -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);
                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);
 
                // Get the command
                $commandInstance = $this->loadCommand($commandName);


@@ -152,12 +152,6 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                // Init command instance
                $commandInstance = null;
 
                // 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
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 79981fb6d5bcbf5b6366f5a0744f60f25a25357a..e94894d4de32972c5ebe2999e3322a47cb456aa4 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -1320,7 +1320,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Now parse the XML tree
                if (!xml_parse($xmlParser, $content)) {
                        // Error found in XML!
                // 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
 
                        throw new XmlParserException(array($this, $xmlParser), BaseHelper::EXCEPTION_XML_PARSER_ERROR);
                } // END - if