diff -u b/core/modules/image/image.install b/core/modules/image/image.install --- b/core/modules/image/image.install +++ b/core/modules/image/image.install @@ -156,8 +156,8 @@ // Convert image style into a configuration object. Drupal::config('image.style.' . $style['name']) ->set('name', $style['name']) - // @todo Replace with $style['label'] after Drupal 7.23 released. - ->set('label', isset($style['label']) ? $style['label'] : $style['name']) + // Labels for image styles added in Drupal 7.23. + ->set('label', $style['label']) ->set('uuid', $uuid->generate()) ->set('status', 1) ->set('langcode', $language->id) diff -u b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php @@ -36,7 +36,7 @@ // Verify that image styles were properly upgraded. $expected_styles['test-custom'] = array( 'name' => 'test-custom', - 'label' => 'test-custom', + 'label' => 'Test custom', 'status' => '1', 'langcode' => 'en', 'effects' => array( @@ -58,7 +58,7 @@ ); $expected_styles['thumbnail'] = array( 'name' => 'thumbnail', - 'label' => 'thumbnail', + 'label' => 'Thumbnail (100x100)', 'status' => '1', 'langcode' => 'en', 'effects' => array ( only in patch2: unchanged: --- a/core/modules/system/tests/upgrade/drupal-7.image.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.image.database.php @@ -14,16 +14,19 @@ db_insert('image_styles')->fields(array( 'isid', 'name', + 'label' )) // Override thumbnail style. ->values(array( 'isid' => '1', 'name' => 'thumbnail', + 'label' => 'Thumbnail (100x100)', )) // Custom style. ->values(array( 'isid' => '2', 'name' => 'test-custom', + 'label' => 'Test custom', )) ->execute();