From b287d6ee1a73fec0b225d7764008176f929e582d Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Thu, 15 Mar 2012 12:45:22 -0400
Subject: [PATCH] - Patch #1479652 by Psikik: convert image style config
 filenames/keys from plural to singular.

---
 core/modules/image/config/image.styles.large.xml | 16 ----------------
 .../modules/image/config/image.styles.medium.xml | 16 ----------------
 .../image/config/image.styles.thumbnail.xml      | 16 ----------------
 core/modules/image/image.module                  | 14 +++++++-------
 4 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 core/modules/image/config/image.styles.large.xml
 delete mode 100644 core/modules/image/config/image.styles.medium.xml
 delete mode 100644 core/modules/image/config/image.styles.thumbnail.xml

diff --git a/core/modules/image/config/image.styles.large.xml b/core/modules/image/config/image.styles.large.xml
deleted file mode 100644
index 62448c18212..00000000000
--- a/core/modules/image/config/image.styles.large.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<config>
-  <name>large</name>
-  <effects>
-    <image_scale_480_480_1>
-      <name>image_scale</name>
-      <ieid>image_scale_480_480_1</ieid>
-      <data>
-        <width>480</width>
-        <height>480</height>
-        <upscale>1</upscale>
-      </data>
-      <weight>0</weight>
-    </image_scale_480_480_1>
-  </effects>
-</config>
diff --git a/core/modules/image/config/image.styles.medium.xml b/core/modules/image/config/image.styles.medium.xml
deleted file mode 100644
index d30187766eb..00000000000
--- a/core/modules/image/config/image.styles.medium.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<config>
-  <name>medium</name>
-  <effects>
-    <image_scale_220_220_1>
-      <name>image_scale</name>
-      <ieid>image_scale_220_220_1</ieid>
-      <data>
-        <width>220</width>
-        <height>220</height>
-        <upscale>1</upscale>
-      </data>
-      <weight>0</weight>
-    </image_scale_220_220_1>
-  </effects>
-</config>
diff --git a/core/modules/image/config/image.styles.thumbnail.xml b/core/modules/image/config/image.styles.thumbnail.xml
deleted file mode 100644
index 385abe61485..00000000000
--- a/core/modules/image/config/image.styles.thumbnail.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<config>
-  <name>thumbnail</name>
-  <effects>
-    <image_scale_100_100_1>
-      <name>image_scale</name>
-      <ieid>image_scale_100_100_1</ieid>
-      <data>
-        <width>100</width>
-        <height>100</height>
-        <upscale>1</upscale>
-      </data>
-      <weight>0</weight>
-    </image_scale_100_100_1>
-  </effects>
-</config>
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index bcccbf79def..7af0c77b90a 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -449,10 +449,10 @@ function image_styles() {
       $styles = array();
 
       // Select the styles we have configured.
-      $configured_styles = config_get_verified_storage_names_with_prefix('image.styles');
+      $configured_styles = config_get_verified_storage_names_with_prefix('image.style');
       foreach ($configured_styles as $config_name) {
         // @todo Allow to retrieve the name without prefix only.
-        $style = image_style_load(str_replace('image.styles.', '', $config_name));
+        $style = image_style_load(str_replace('image.style.', '', $config_name));
         $styles[$style['name']] = $style;
       }
       drupal_alter('image_styles', $styles);
@@ -476,7 +476,7 @@ function image_styles() {
  * @see image_effect_load()
  */
 function image_style_load($name) {
-  $style = config('image.styles.' . $name)->get();
+  $style = config('image.style.' . $name)->get();
 
   // @todo Requires a more reliable + generic method to check for whether the
   //   configuration object exists.
@@ -504,7 +504,7 @@ function image_style_load($name) {
  *   An image style array.
  */
 function image_style_save($style) {
-  $config = config('image.styles.' . $style['name']);
+  $config = config('image.style.' . $style['name']);
   $config->set('name', $style['name']);
   if (isset($style['effects'])) {
     $config->set('effects', $style['effects']);
@@ -540,7 +540,7 @@ function image_style_save($style) {
 function image_style_delete($style, $replacement_style_name = '') {
   image_style_flush($style);
 
-  $config = config('image.styles.' . $style['name']);
+  $config = config('image.style.' . $style['name']);
   $config->delete();
 
   // Let other modules update as necessary on save.
@@ -985,7 +985,7 @@ function image_effect_load($ieid, $style_name) {
  *   An image effect array. In the case of a new effect, 'ieid' will be set.
  */
 function image_effect_save($style_name, $effect) {
-  $config = config('image.styles.' . $style_name);
+  $config = config('image.style.' . $style_name);
 
   if (!isset($effect['ieid']) || empty($effect['ieid'])) {
     // We need to generate the ieid and save the new effect.
@@ -1016,7 +1016,7 @@ function image_effect_save($style_name, $effect) {
  *   An image effect array.
  */
 function image_effect_delete($style_name, $effect) {
-  $config = config('image.styles.' . $style_name);
+  $config = config('image.style.' . $style_name);
   $config->clear('effects.' . $effect['ieid']);
   $config->save();
   $style = image_style_load($style_name);