Method convertToClassName() and convertDashesToUnderscores() are now static as

[core.git] / inc / classes / main / resolver / controller / class_BaseControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 5091c750e0a835eb8ab3328065eae5b6c650f3ae..5615515afc62531a2b84a2e158902b21e40fc5be 100644 (file)
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@ -57,7 +57,7 @@ class BaseControllerResolver extends BaseResolver {
                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BEFORE: controller=' . $controllerName);
                if ($controllerName != $defaultController) {
                        // Create controller class name
                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BEFORE: controller=' . $controllerName);
                if ($controllerName != $defaultController) {
                        // Create controller class name

-                       $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
+                       $className = $this->getCapitalizedClassPrefix() . self::convertToClassName($controllerName) . 'Controller';

 
                        // ... and set it
                        $this->setClassName($className);
 
                        // ... and set it
                        $this->setClassName($className);


@@ -118,7 +118,7 @@ class BaseControllerResolver extends BaseResolver {
                } // END - if
 
                // Create class name
                } // END - if
 
                // Create class name

-               $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
+               $className = $this->getCapitalizedClassPrefix() . self::convertToClassName($controllerName) . 'Controller';

 
                // Now, let us create the full name of the controller class
                $this->setClassName($className);
 
                // Now, let us create the full name of the controller class
                $this->setClassName($className);