commit 6e4a1240c92f30e5a76e058b1e5070e378d3f522 Author: Andy Postnikov Date: Thu Sep 27 23:20:55 2012 +0700 Fix after #1785974 diff --git a/core/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc index fec9d4c..24c1d10 100644 --- a/core/modules/contact/contact.admin.inc +++ b/core/modules/contact/contact.admin.inc @@ -22,7 +22,7 @@ function contact_category_list() { $rows = array(); $categories = entity_load_multiple('contact_category'); - uasort($categories, 'Drupal\config\ConfigEntityBase::sort'); + uasort($categories, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort'); $default_category = config('contact.settings')->get('default_category'); // Loop through the categories and add them to the table. diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index c8b1bd2..e61bb56 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -203,7 +203,7 @@ function contact_entity_info() { $types['contact_category'] = array( 'label' => 'Category', 'entity class' => 'Drupal\contact\Category', - 'controller class' => 'Drupal\config\ConfigStorageController', + 'controller class' => 'Drupal\Core\Config\Entity\ConfigStorageController', 'form controller class' => array( 'default' => 'Drupal\contact\CategoryFormController', ), diff --git a/core/modules/contact/contact.pages.inc b/core/modules/contact/contact.pages.inc index d84da57..bfea6c5 100644 --- a/core/modules/contact/contact.pages.inc +++ b/core/modules/contact/contact.pages.inc @@ -41,7 +41,7 @@ function contact_site_form($form, &$form_state) { } // Prepare array for select options. - uasort($categories, 'Drupal\config\ConfigEntityBase::sort'); + uasort($categories, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort'); $options = array(); foreach ($categories as $category) { $options[$category->id()] = $category->label(); diff --git a/core/modules/contact/lib/Drupal/contact/Category.php b/core/modules/contact/lib/Drupal/contact/Category.php index 31d95aa..1a34479 100644 --- a/core/modules/contact/lib/Drupal/contact/Category.php +++ b/core/modules/contact/lib/Drupal/contact/Category.php @@ -7,7 +7,7 @@ namespace Drupal\contact; -use Drupal\config\ConfigEntityBase; +use Drupal\Core\Config\Entity\ConfigEntityBase; /** * Defines the contact category entity.