diff --git a/core/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc index 8519714..3dae818 100644 --- a/core/modules/contact/contact.admin.inc +++ b/core/modules/contact/contact.admin.inc @@ -21,7 +21,7 @@ function contact_category_list() { ); $rows = array(); - $categories = entity_load_multiple('contact_category', FALSE); + $categories = entity_load_multiple('contact_category'); uasort($categories, 'Drupal\config\ConfigurableBase::sort'); $default_category = config('contact.settings')->get('default_category'); diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index c38fbb2..cbdbda7 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -207,6 +207,7 @@ function contact_entity_info() { 'label' => 'Category', 'controller class' => 'Drupal\config\ConfigStorageController', 'entity class' => 'Drupal\contact\Category', + 'config prefix' => 'contact.category', 'entity keys' => array( 'id' => 'id', 'label' => 'label', diff --git a/core/modules/contact/contact.pages.inc b/core/modules/contact/contact.pages.inc index 9e93f30..0d2415f 100644 --- a/core/modules/contact/contact.pages.inc +++ b/core/modules/contact/contact.pages.inc @@ -28,7 +28,7 @@ function contact_site_form($form, &$form_state) { } // Get an array of the categories and the current default category. - $categories = entity_load_multiple('contact_category', FALSE); + $categories = entity_load_multiple('contact_category'); // If there are no categories, do not display the form. if (!$categories) { diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php index 76bf23b..dfb9d4b 100644 --- a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php +++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php @@ -129,7 +129,7 @@ class ContactSitewideTest extends WebTestBase { $this->assertResponse(200, t('Access granted to anonymous user with permission.')); // Submit contact form with invalid values. - $categories = entity_load_multiple('contact_category', FALSE); + $categories = entity_load_multiple('contact_category'); $id = key($categories); $this->submitContact('', $recipients[0], $this->randomName(16), $id, $this->randomName(64)); @@ -295,7 +295,7 @@ class ContactSitewideTest extends WebTestBase { * Deletes all categories. */ function deleteCategories() { - $categories = entity_load_multiple('contact_category', FALSE); + $categories = entity_load_multiple('contact_category'); foreach ($categories as $id => $category) { $this->drupalPost('admin/structure/contact/manage/' . $id . '/delete', array(), t('Delete')); $this->assertRaw(t('Category %label has been deleted.', array('%label' => $category->label())), t('Category deleted successfully.'));