Commit 1f86ba60 authored by catch's avatar catch

Issue #1785974 by tim.plunkett, alexpott, sun: Move ConfigEntity into a Core component.

parent 980fdefa
......@@ -468,6 +468,9 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
// Allow modules to react prior to the installation of a module.
module_invoke_all('modules_preinstall', array($module));
// Clear the entity info cache before importing new configuration.
entity_info_cache_clear();
// Now install the module if necessary.
if (drupal_get_installed_schema_version($module, TRUE) == SCHEMA_UNINSTALLED) {
drupal_install_schema($module);
......@@ -494,7 +497,6 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
watchdog('system', '%module module installed.', array('%module' => $module), WATCHDOG_INFO);
}
entity_info_cache_clear();
// Allow modules to react prior to the enabling of a module.
module_invoke_all('modules_preenable', array($module));
......
......@@ -2,10 +2,10 @@
/**
* @file
* Definition of Drupal\config\ConfigEntityBase.
* Definition of Drupal\Core\Config\Entity\ConfigEntityBase.
*/
namespace Drupal\config;
namespace Drupal\Core\Config\Entity;
use Drupal\Core\Entity\Entity;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Definition of Drupal\config\ConfigEntityInterface.
* Definition of Drupal\Core\Config\Entity\ConfigEntityInterface.
*/
namespace Drupal\config;
namespace Drupal\Core\Config\Entity;
use Drupal\Core\Entity\EntityInterface;
......
......@@ -2,10 +2,10 @@
/**
* @file
* Definition of Drupal\config\ConfigStorageController.
* Definition of Drupal\Core\Config\Entity\ConfigStorageController.
*/
namespace Drupal\config;
namespace Drupal\Core\Config\Entity;
use Drupal\Component\Uuid\Uuid;
use Drupal\Core\Entity\EntityInterface;
......@@ -35,7 +35,7 @@ class ConfigStorageController implements EntityStorageControllerInterface {
/**
* Additional arguments to pass to hook_TYPE_load().
*
* Set before calling Drupal\config\ConfigStorageController::attachLoad().
* Set before calling Drupal\Core\Config\Entity\ConfigStorageController::attachLoad().
*
* @var array
*/
......
......@@ -2,5 +2,4 @@ name = Configuration test module
package = Core
version = VERSION
core = 8.x
dependencies[] = config
hidden = TRUE
......@@ -80,7 +80,7 @@ function config_test_config_import_delete($name, $new_config, $old_config) {
function config_test_entity_info() {
$types['config_test'] = array(
'label' => 'Test configuration',
'controller class' => 'Drupal\config\ConfigStorageController',
'controller class' => 'Drupal\Core\Config\Entity\ConfigStorageController',
'entity class' => 'Drupal\config_test\ConfigTest',
'uri callback' => 'config_test_uri',
'config prefix' => 'config_test.dynamic',
......@@ -177,7 +177,7 @@ function config_test_delete($id) {
*/
function config_test_list_page() {
$entities = entity_load_multiple('config_test');
uasort($entities, 'Drupal\config\ConfigEntityBase::sort');
uasort($entities, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort');
$rows = array();
foreach ($entities as $config_test) {
......
......@@ -7,7 +7,7 @@
namespace Drupal\config_test;
use Drupal\config\ConfigEntityBase;
use Drupal\Core\Config\Entity\ConfigEntityBase;
/**
* Defines the ConfigTest configuration entity.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment