Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes / main / registry / class_BaseRegistry.php

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index e7f787b17efbdb069dce75748e7d6af2ae65d5d5..718f0a4f24b17176e13676eaf7562f0c44d8122e 100644 (file)
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -25,7 +25,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
        /**
         * Instance of this class
         */
-       private static $registryInstance = null;
+       private static $registryInstance = NULL;
 
        /**
         * Instance registry
@@ -74,7 +74,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
        }
 
        /**
-        * Getter for whole instanceregistry
+        * Getter for whole instance registry
         *
         * @return      $instanceRegistry       The whole instance registry array
         */
@@ -100,7 +100,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         *
         * @return      $entries        An array with entries from this registry
         */
-       public final function getEntries ($key = null) {
+       public final function getEntries ($key = NULL) {
                // Default is whole array
                $entries = $this->rawEntries;
 
@@ -164,7 +164,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         */
        public function getInstance ($instanceKey) {
                // By default the instance is not in registry
-               $objectInstance = null;
+               $objectInstance = NULL;
 
                // Is the instance there?
                if ($this->instanceExists($instanceKey)) {