projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Static method getInstance() conflicts with getInstance() in class BaseRegistry,
[core.git]
/
inc
/
config
/
class_FrameworkConfiguration.php
diff --git
a/inc/config/class_FrameworkConfiguration.php
b/inc/config/class_FrameworkConfiguration.php
index 938b67ba99c954a1265b1e44dedf1be577554eee..5006ea46680ef43d5be943444fcf8ad34a7b905f 100644
(file)
--- a/
inc/config/class_FrameworkConfiguration.php
+++ b/
inc/config/class_FrameworkConfiguration.php
@@
-65,7
+65,7
@@
class FrameworkConfiguration implements Registerable {
*
* @return $configInstance An instance of this class
*/
- public static final function getInstance () {
+ public static final function get
Self
Instance () {
// is the instance there?
if (is_null(self::$configInstance)) {
// Create a config instance