Updated 'core' + used DatabaseWrapperFactory to have only one instance of each

wrapper which is okay.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/city/main/manager/city/class_CityManager.php b/application/city/main/manager/city/class_CityManager.php
index 11d1245fcb03a0d0703e8cb39460f2614bd85c81..64f7983dcd83ccc96d8767d6064fc198c690089e 100644 (file)
--- a/application/city/main/manager/city/class_CityManager.php
+++ b/application/city/main/manager/city/class_CityManager.php
@@ -42,7 +42,7 @@ class CityManager extends BaseManager implements ManageableCity {
                $managerInstance = new CityManager();
 
                // Get database wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('city_info_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_info_db_wrapper_class');
 
                // And set it here
                $managerInstance->setWrapperInstance($wrapperInstance);

diff --git a/application/city/main/manager/city_map/class_CityMapManager.php b/application/city/main/manager/city_map/class_CityMapManager.php
index cfee707da041a18045b89b07e0973443b016f7c0..576c76e260880d3e2d370f1f0362d48bf34fee25 100644 (file)
--- a/application/city/main/manager/city_map/class_CityMapManager.php
+++ b/application/city/main/manager/city_map/class_CityMapManager.php
@@ -42,7 +42,7 @@ class CityMapManager extends BaseFrameworkSystem implements ManageableCityMap, R
                $managerInstance = new CityMapManager();
 
                // Get database wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('city_map_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_map_db_wrapper_class');
 
                // And set it here
                $managerInstance->setWrapperInstance($wrapperInstance);

diff --git a/application/city/main/manager/region/class_RegionManager.php b/application/city/main/manager/region/class_RegionManager.php
index c31b9659e6153cca84e6982cdc750e2db7bd9c00..2f56b28ef57d6d3874ac4a4a01ec66b2134b9511 100644 (file)
--- a/application/city/main/manager/region/class_RegionManager.php
+++ b/application/city/main/manager/region/class_RegionManager.php
@@ -42,7 +42,7 @@ class RegionManager extends BaseManager implements ManageableRegion {
                $managerInstance = new RegionManager();
 
                // Get database wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('region_info_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('region_info_db_wrapper_class');
 
                // And set it here
                $managerInstance->setWrapperInstance($wrapperInstance);

diff --git a/application/city/main/manager/region/class_RegionMapManager.php b/application/city/main/manager/region/class_RegionMapManager.php
index 516b1ba41643f12282b2b28ba9063b164b5a8854..fe06506fd103d28fd0d008e734200dbe0420255d 100644 (file)
--- a/application/city/main/manager/region/class_RegionMapManager.php
+++ b/application/city/main/manager/region/class_RegionMapManager.php
@@ -42,7 +42,7 @@ class RegionMapManager extends BaseManager implements ManageableRegionMap {
                $managerInstance = new RegionMapManager();
 
                // Get database wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('region_map_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('region_map_db_wrapper_class');
 
                // And set it here
                $managerInstance->setWrapperInstance($wrapperInstance);

diff --git a/application/city/main/registration/class_CityRegistration.php b/application/city/main/registration/class_CityRegistration.php
index fd72623e20955f720b79af96b6410d609fd4ea2a..8169bb7573ba5a42e2afb9482b6fcaffa64c3ff1 100644 (file)
--- a/application/city/main/registration/class_CityRegistration.php
+++ b/application/city/main/registration/class_CityRegistration.php
@@ -120,7 +120,7 @@ class CityRegistration extends BaseRegistration implements UserRegister {
         */
        public function registerNewUser () {
                // Get a user database wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('user_db_wrapper_class');
 
                // Use this instance to insert the whole registration instance
                $wrapperInstance->insertRegistrationObject($this);

diff --git a/core b/core
index 7a04a994e89aaa587b9163b5a0e37a9c00443408..ea315b99e09ba2c222006947a7dbc605bf0f437e 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7a04a994e89aaa587b9163b5a0e37a9c00443408
+Subproject commit ea315b99e09ba2c222006947a7dbc605bf0f437e