Updated to latest 'core' + convertToClassName() and convertDashesToUnderscores()...

[hub.git] / application / hub / main / template / class_BaseXmlTemplateEngine.php

diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php
index db4e2cfa21efad1622f7cc24d39157418bb00795..6fca12e7c526343a41a45200314f22d69deaef5a 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -245,7 +245,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                // Is the template dependency set?
                if ((!empty($templateDependency)) && (!isset($this->dependencyContent[$node]))) {
                        // Get a temporay template instance
-                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '_' . $this->convertDashesToUnderscores($node) . '_' . $this->xmlTemplateType . '_template_class');
+                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '_' . self::convertDashesToUnderscores($node) . '_' . $this->xmlTemplateType . '_template_class');
 
                        // Then load it
                        $templateInstance->loadXmlTemplate($templateDependency);
@@ -269,7 +269,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         */
        public final function startElement ($resource, $element, array $attributes) {
                // Initial method name which will never be called...
-               $methodName = 'init' . $this->convertToClassName($this->xmlTemplateType);
+               $methodName = 'init' . self::convertToClassName($this->xmlTemplateType);
 
                // Make the element name lower-case
                $element = strtolower($element);
@@ -278,13 +278,13 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                //* DEBUG: */ echo "START: &gt;".$element."&lt;<br />\n";
                if (in_array($element, $this->getMainNodes())) {
                        // Okay, main node found!
-                       $methodName = 'start' . $this->convertToClassName($element);
+                       $methodName = 'start' . self::convertToClassName($element);
 
                        // Set it
                        $this->setCurrMainNode($element);
                } elseif (in_array($element, $this->getSubNodes())) {
                        // Sub node found
-                       $methodName = 'start' . $this->convertToClassName($element);
+                       $methodName = 'start' . self::convertToClassName($element);
                } else {
                        // Invalid node name found
                        throw new InvalidXmlNodeException(array($this, $element, $attributes), XmlParser::EXCEPTION_XML_NODE_UNKNOWN);
@@ -314,7 +314,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                } // END - if
 
                // Construct method name
-               $methodName = 'finish' . $this->convertToClassName($nodeName);
+               $methodName = 'finish' . self::convertToClassName($nodeName);
 
                // Call the corresponding method
                //* DEBUG: */ echo "call: ".$methodName."<br />\n";