diff options
| author | David Rothstein <drothstein@gmail.com> | 2012-12-08 16:19:28 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2012-12-08 16:19:28 -0500 |
| commit | 2f00fb35896c796989daa6dd0527709daa71e040 (patch) | |
| tree | 4fd7ee66aa86f36fe2b23be2d41048e557d91e24 | |
| parent | 2b86b82f49c88b493a7c8f41221dd061ea90590e (diff) | |
| download | brdo-2f00fb35896c796989daa6dd0527709daa71e040.tar.gz brdo-2f00fb35896c796989daa6dd0527709daa71e040.tar.bz2 | |
Issue #1833028 by michaelmol | rmfleet: Fixed bug which prevented image styles from being reverted on PHP 5.4.
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | modules/image/image.admin.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6b2c303db..e603b0258 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ Drupal 7.18, xxxx-xx-xx (development version) ----------------------- +- Fixed bug which prevented image styles from being reverted on PHP 5.4. - Made the default .htaccess rules protocol sensitive to improve security for sites which use HTTPS and redirect between "www" and non-"www" versions of the page. diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc index ab99a49e8..9f0fab254 100644 --- a/modules/image/image.admin.inc +++ b/modules/image/image.admin.inc @@ -326,7 +326,7 @@ function image_style_delete_form_submit($form, &$form_state) { /** * Confirmation form to revert a database style to its default. */ -function image_style_revert_form($form, $form_state, $style) { +function image_style_revert_form($form, &$form_state, $style) { $form_state['image_style'] = $style; return confirm_form( |