summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--modules/image/image.admin.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 077d15c87..d09db0637 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ Drupal 7.15, xxxx-xx-xx (development version)
- Fixed regression: The first plural index on a page was not calculated
correctly.
- Fixed bug: Language detection by domain only worked on port 80.
+- Fixed bug which prevented image styles from being deleted on PHP 5.4.
Drupal 7.14 2012-05-02
----------------------
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc
index abcfab449..ab99a49e8 100644
--- a/modules/image/image.admin.inc
+++ b/modules/image/image.admin.inc
@@ -292,7 +292,7 @@ function image_style_name_validate($element, $form_state) {
* @ingroup forms
* @see image_style_delete_form_submit()
*/
-function image_style_delete_form($form, $form_state, $style) {
+function image_style_delete_form($form, &$form_state, $style) {
$form_state['image_style'] = $style;
$replacement_styles = array_diff_key(image_style_options(), array($style['name'] => ''));