Any chance to get an upgrade for Drupal 7? I need this module for a wiki (yes, I know I culd use D6; indeed, I have a D6 version of my site too).

CommentFileSizeAuthor
#5 diff-d7.patch25.39 KBpkiraly
#4 diff-d7.patch21.12 KBpkiraly
#1 diff-d7.patch21.12 KBpkiraly

Comments

pkiraly’s picture

pkiraly commented
StatusFileSize
new diff-d7.patch21.12 KB

Hi,

during the drupal codesprint yesterday in Budapest I've created a patch, which creates D7 version from the D6 version.

Péter

pkiraly’s picture

pkiraly commented

thanks for chx, who helped me to create this patch

chx’s picture

chx commented
Status: Active » Needs review
pkiraly’s picture

pkiraly commented
StatusFileSize
new diff-d7.patch21.12 KB

one more time...

pkiraly’s picture

pkiraly commented
StatusFileSize
new diff-d7.patch25.39 KB

modifications according to chx's critiques

naught101’s picture

naught101 commented

subscribing.

By the way, Moshe already created a d7 dev version in 2008(!). I've no idea if it works or not, I haven't tried... http://drupal.org/node/20492/release?api_version[]=103

David Latapie’s picture

David Latapie commented

Thank you guys for this. I don't know how to test patches (plus, I am somewhat reluctant with them), so I will quietly wait for a dev module to be released.

coderintherye’s picture

coderintherye commented

subscribing so I can remember to review this patch.

SeanBannister’s picture

SeanBannister commented

Sub

BenK’s picture

BenK commented
Status: Needs review » Needs work

Hey everyone,

I've just finished testing the patch in #5. The patch applied fine to HEAD and I'm getting all of the normal options one a node's revision page. But when trying to run a diff on revisions of a node, I'm getting the following error messages:

Warning: htmlspecialchars() expects parameter 1 to be string, array given in check_plain() (line 1500 of /home/sandboxes/sandbox11/drupal/includes/bootstrap.inc).
Notice: Undefined property: stdClass::$has_body in node_diff() (line 20 of /home/sandboxes/sandbox11/drupal/sites/all/modules/diff-HEAD/node.inc).
Notice: Undefined property: stdClass::$has_body in node_diff() (line 20 of /home/sandboxes/sandbox11/drupal/sites/all/modules/diff-HEAD/node.inc).

Additionally, the diff is reporting "No visible changes" even though I specifically created some changes for testing purposes.

Any ideas on how to fix?

Thanks,
Ben

BenK’s picture

BenK commented

For anyone else who can help with testing, this is all you need to do:

1. Checkout a copy of HEAD via CVS. Use this command:

cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d diff-HEAD contributions/modules/diff/

2. Download a copy of the patch to the main module folder. To do this, navigate to the diff-HEAD folder and then use this command:

wget http://drupal.org/files/issues/diff-d7_1.patch

3. Patch the files. From the same folder, use this command:

patch -p0 < diff-d7_1.patch

--Ben :-)

yhahn’s picture

yhahn commented
Status: Needs work » Fixed

Initial merge of DRUPAL-6--2 to DRUPAL-7--2 complete and tagged here: http://drupal.org/node/907118

I expect that there are plenty of bugs, so please do plenty of testing, reviewing and patching!

Status: Fixed » Closed (fixed)
Issue tags: -diff, -Drupal 7.x

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

Issue tags: +diff, +Drupal 7.x

Restoring issue tags, see #2125755: System messages removed all issue tags during D7 upgrade.