In file content.diff.inc there's a loop for all CCK fields in the nodes being compared and generates a row in $results even when field is not explicitly supported by this loop.

When a CCK field implements diff support, it generates its own results that are mixed by module_invoke_all used in diff module.

The attached patch fixes this. It generates results for diff module only for fields directly supported.

CommentFileSizeAuthor
content.diff.inc_.patch422 bytesmarkus_petrux
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

markus_petrux’s picture

markus_petrux CreditAttribution: markus_petrux commented

Please, see the following issue in Money's queue for an example where this bug arised:

#341365: Implement hook_diff() for improved revision management

yched’s picture

yched CreditAttribution: yched commented
Status: Needs review » Fixed

Fixed in 6.x-2.x (slightly different fix). Thanks !
I also removed the 'links module' code branches, they don't belong in CCK.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.