summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rothstein2012-06-09 20:45:50 (GMT)
committer David Rothstein2012-06-09 20:45:50 (GMT)
commit8a125127c2380ef54e02dc4b7c01c941f77526af (patch)
treeb283b2e927b746dc06ade5701ceb6147d9e1e396
parenta80c7e883d38a6d36971108552715e5348e41ee3 (diff)
Issue #1614292 by brockjo, Albert Volkman | neclimdul: Fixed image_style_delete_form() doesn't take form_state() by reference (prevented image styles from being deleted on PHP 5.4).
-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 077d15c..d09db06 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 abcfab4..ab99a49 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'] => ''));