Core's image_style_flush() has been fixed, so amazons3_image_style_flush() can be simplified. [#2027129]

Over at #1057656: Image styles don't flush for images stored non-default schemes there's a patch which fixes the core bug that was preventing it from deleting image styles on remote file schemes (like s3://). With that patch in place, amazons3_image_style_flush() no longer needs to call drupal_rmdir(), which means the hook can be simplified with the attached patch.

This patch also fixes a long-standing bug in amazons3_image_style_flush(), making it treat the $style variable as an array, rather than an object.

EDIT: I just realized that my patch is an updated version of aasarava's patch from #1695102: Actual working implementation of hook_image_style_flush(). I had forgotten that I got the original patch from that issue.

Comment	File	Size	Author
	amazons3_simplified_hook_image_style_flush.patch	869 bytes	coredumperror

Comments

Comment #1

haysuess commented 26 June 2013 at 22:23

I applied both this patch, and the one mentioned in your comment. I went to one of my Image Styles and hit update, and got this error:

PDOException: SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1: DELETE FROM {amazons3_file} WHERE (); Array ( ) in AmazonS3StreamWrapper->rmdir() (line 710 of sites/all/modules/amazons3/AmazonS3StreamWrapper.inc).

It DID seem to flush the image style though, as my new effects are loading.

Is there something I did wrong?

Comment #2

haysuess commented 26 June 2013 at 22:29

Looks like I needed to apply this patch too: https://drupal.org/node/1653316

I have the Beta 7 of Amazon S3 running, not the dev version which is a year newer, so I guess it was missing that fix.

Hope this helps someone else.

Comment #3

djake commented 19 August 2013 at 21:15

Status:

Needs review

» Reviewed & tested by the community

This patch was a lifesaver. After updating core to 7.23, I was almost completely unable to edit or add styles. This patch fixed it. Amazon Linux, PHP 5.3.