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

[core.git] / inc / classes / main / resolver / action / class_BaseActionResolver.php

diff --git a/inc/classes/main/resolver/action/class_BaseActionResolver.php b/inc/classes/main/resolver/action/class_BaseActionResolver.php
index 60e14604f0ff59057bf3399f306f46ced1243a38..44836e9d52be1000b3b51f6c4097f78a448f11d4 100644 (file)
--- a/inc/classes/main/resolver/action/class_BaseActionResolver.php
+++ b/inc/classes/main/resolver/action/class_BaseActionResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +75,7 @@ class BaseActionResolver extends BaseResolver {
                } // END - if
 
                // Create class name
-               $className = $this->getClassPrefix() . $this->convertToClassName($actionName) . 'Action';
+               $className = $this->getCapitalizedClassPrefix() . self::convertToClassName($actionName) . 'Action';
 
                // Now, let us create the full name of the action class
                $this->setClassName($className);
@@ -103,7 +103,7 @@ class BaseActionResolver extends BaseResolver {
                $actionInstance = NULL;
 
                // Create action class name
-               $className = $this->getClassPrefix() . $this->convertToClassName($this->getActionName()) . 'Action';
+               $className = $this->getCapitalizedClassPrefix() . self::convertToClassName($this->getActionName()) . 'Action';
 
                // ... and set it
                $this->setClassName($className);