summaryrefslogtreecommitdiff
path: root/modules/image
diff options
context:
space:
mode:
Diffstat (limited to 'modules/image')
-rw-r--r--modules/image/image.admin.inc2
-rw-r--r--modules/image/image.install3
2 files changed, 3 insertions, 2 deletions
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(
diff --git a/modules/image/image.install b/modules/image/image.install
index b7aac7152..1d7bd4ef4 100644
--- a/modules/image/image.install
+++ b/modules/image/image.install
@@ -391,7 +391,8 @@ function image_update_7002(array &$sandbox) {
}
// Process the table at the top of the list.
- $table = reset(array_keys($sandbox['tables']));
+ $keys = array_keys($sandbox['tables']);
+ $table = reset($keys);
$sandbox['processed'] += _image_update_7002_populate_dimensions($table, $sandbox['tables'][$table], $sandbox['last_fid']);
// Has the table been fully processed?