commit 8b16adbec94456c1ea4e3036a269edad870b3ff4
Merge: 1d93655 99575b2
Author: Klaus Purer <klaus.purer@gmail.com>
Date:   Tue Jul 30 17:52:38 2013 +0200

    Merge remote-tracking branch 'origin/8.x' into user-validation-2002162
    
    Conflicts:
    	core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php

diff --cc core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
index 8324d4a,988afa7..3b772b7
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
@@@ -190,8 -190,7 +190,8 @@@ abstract class EntityStorageControllerB
              // of making LegacyConfigFieldItem implement PrepareCacheInterface.
              // @todo Remove once all core field types have been converted (see
              // http://drupal.org/node/2014671).
 -            || (is_subclass_of($type_definition['class'], '\Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem') && function_exists($type_definition['provider'] . '_field_load'))) {
 +            || (is_subclass_of($type_definition['class'], '\Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem')
-               && isset($type_definition['module']) && function_exists($type_definition['module'] . '_field_load'))) {
++              && isset($type_definition['provider']) && function_exists($type_definition['provider'] . '_field_load'))) {
  
              // Call the prepareCache() method directly on each item
              // individually.