Some changes in core which are described here http://drupal.org/node/64279#node-view and here http://drupal.org/node/64279#node-types caused image module not to work anymore with the latest HEAD version of drupal core.
My patch corrects this hook usages in image module

CommentFileSizeAuthor
#9 image_head_2.patch.txt5.05 KBRok Žlender
#8 image_head_1.patch4.53 KBdrewish
#5 image_head_0.patch.txt4.55 KBRok Žlender
#4 image_head_0.patch4.53 KBdrewish
#1 image_head.patch2.06 KBdrewish
image.module.patch.txt2.77 KBRok Žlender

Comments

drewish’s picture

drewish commented
StatusFileSize
new image_head.patch2.06 KB

I updated Rok Žlender's patch to add a .info file and I reverted the node's description back to it's initial, shorter value.

drewish’s picture

drewish commented
Title: Changes in hook_node_info and hook_view broke image module » Update module for 5.0

(a little more descriptive title)

drewish’s picture

drewish commented

included vhmauery's changes to the settings forms and t() strings from this issue

drewish’s picture

drewish commented
StatusFileSize
new image_head_0.patch4.53 KB

oh, and here's that patch

Rok Žlender’s picture

Rok Žlender commented
StatusFileSize
new image_head_0.patch.txt4.55 KB

Patch looks good.
I fixed only one thing in image_view return $node statement is missing. After this I ran simpletest image tests and there were no failures.

drewish’s picture

drewish commented

Good catch Rok, I'd noticed something wasn't working quite right but hadn't had time to track it down yet.

drewish’s picture

drewish commented

humm, i got an error that your patch was corrupted. i added the return statement to mine and fixed t() place holder.

i think we still need to do some work on the image_view() function. it's ouputting two copies of the body.

drewish’s picture

drewish commented
StatusFileSize
new image_head_1.patch4.53 KB

(note to self, preview, then attach patch...)

Rok Žlender’s picture

Rok Žlender commented
StatusFileSize
new image_head_2.patch.txt5.05 KB

The problem with two body outputs was in theme_image_body function which appended $node->body even though node_prepare already takes care of outputing body. I think my patch fixes this and hope it works now.
I changed the way image.info was diffed it should work on any system now and I diffed from drupal root dir.

drewish’s picture

drewish commented

Rok, your patch didn't include my t() change. Incase you didn't know now '%foo' => $foo is equivalent to '!foo' => theme('placeholder', $foo).

walkah’s picture

walkah commented
Status: Needs review » Fixed

committed. thanks a lot Rok & drewish!

drewish’s picture

drewish commented

walka, which patch did you commit? did you fix the t() placeholder problem?

Anonymous’s picture

(not verified) commented
Status: Fixed » Closed (fixed)