From 01715fc6c3d1bd3a10c27dd0263fcfa08daef995 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 3 Jul 2015 16:59:44 +0200 Subject: [PATCH] Updated 'core' + used DatabaseWrapperFactory to have only one instance of each wrapper which is okay. Signed-off-by: Roland Haeder --- application/city/main/manager/city/class_CityManager.php | 2 +- application/city/main/manager/city_map/class_CityMapManager.php | 2 +- application/city/main/manager/region/class_RegionManager.php | 2 +- application/city/main/manager/region/class_RegionMapManager.php | 2 +- application/city/main/registration/class_CityRegistration.php | 2 +- core | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/city/main/manager/city/class_CityManager.php b/application/city/main/manager/city/class_CityManager.php index 11d1245..64f7983 100644 --- 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 cfee707..576c76e 100644 --- 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 c31b965..2f56b28 100644 --- 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 516b1ba..fe06506 100644 --- 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 fd72623..8169bb7 100644 --- 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 7a04a99..ea315b9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7a04a994e89aaa587b9163b5a0e37a9c00443408 +Subproject commit ea315b99e09ba2c222006947a7dbc605bf0f437e -- 2.39.5