'public static final' is correct

[core.git] / inc / classes / main / user / member / class_Member.php

diff --git a/inc/classes/main/user/member/class_Member.php b/inc/classes/main/user/member/class_Member.php
index 9fc5883996641dcb38651c5e2bf5914305270a67..9a6fff947b611586566f5d48d87c41b328e9be4a 100644 (file)
--- a/inc/classes/main/user/member/class_Member.php
+++ b/inc/classes/main/user/member/class_Member.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -41,7 +41,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
         * @return      $userInstance   An instance of this user class
         * @throws      UsernameMissingException        If the username does not exist
         */
-       public final static function createMemberByUsername ($userName) {
+       public static final function createMemberByUsername ($userName) {
                // Get a new instance
                $userInstance = new Member();
 
@@ -65,7 +65,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
         */
-       public final static function createMemberByEmail ($email) {
+       public static final function createMemberByEmail ($email) {
                // Get a new instance
                $userInstance = new Member();
 
@@ -83,7 +83,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
         * @return      $userInstance           An instance of this user class
         * @todo        Add more ways over creating user classes
         */
-       public final static function createMemberByRequest (Requestable $requestInstance) {
+       public static final function createMemberByRequest (Requestable $requestInstance) {
                // Determine if by email or username
                if (!is_null($requestInstance->getRequestElement('username'))) {
                        // Username supplied
@@ -117,7 +117,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 
                // If there is no action use the default on
                if (is_null($lastAction)) {
-                       $lastAction = $this->getConfigInstance()->readConfig('login_default_action');
+                       $lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action');
                } // END - if
 
                // Get a critieria instance