Considering we're using WYSIWYG html editors and revision diffs in the Wiki feature look a bit naff (especially to a user unaware of html tags)...

...this patch seems a good compromise, seeing as having rich text diffs seems like a big no-no-no from what I've read:

http://drupal.org/node/372957#comment-4312346

CommentFileSizeAuthor
#7 1363938-commons-diff-remove-html.patch11.65 KBezra-g
#6 drupal_commons-add-diff-strip-tags-1363938-3.patch11.68 KBmstef
#3 drupal_commons-add-diff-strip-tags-1363938-2.patch11.55 KBmstef
#2 drupal_commons-add-diff-strip-tags-1363938.patch11.55 KBmstef

Comments

mstef’s picture

mstef commented

Patch confirmed to work.

If we do want to add this, we'd also have to set variables for each content type:

variable_set("remove_markup_default_{$content_type}", TRUE)

mstef’s picture

mstef commented
Status: Active » Needs review
StatusFileSize
new drupal_commons-add-diff-strip-tags-1363938.patch11.55 KB

Big patch, updating all features containing content types, and the make file to bring in the patch.

mstef’s picture

mstef commented
StatusFileSize
new drupal_commons-add-diff-strip-tags-1363938-2.patch11.55 KB

New patch, giving diff the 2.x branch in the make file.

ezra-g’s picture

ezra-g commented
Status: Needs review » Needs work

The drush make syntax is incorrect for the diff module and therefore prevents Drush make from packaging commons. Please see an example of correct syntax for pulling from git.

[Edit:] In the code comment above a patch, please reference the specific Drupal.org issue comment associated with the patch rather than the issue node, since the comment # is more specific. Thanks!

mstef’s picture

mstef commented

Myyyy bad..

new patch coming right away

mstef’s picture

mstef commented
Status: Needs work » Needs review
StatusFileSize
new drupal_commons-add-diff-strip-tags-1363938-3.patch11.68 KB

Should do it..

ezra-g’s picture

ezra-g commented
StatusFileSize
new 1363938-commons-diff-remove-html.patch11.65 KB

The patch in #6 was close:

+; http://http://drupal.org/node/1363938
+projects[diff][patch][] = "http://drupal.org/files/issues/diff_strip_html-372957-62.patch"

The comment there refers to the present issue, rather than the *specific comment within the Diff project where the patch originated*.

The patch file specified no longer applies to the latest from the 6.x-2.x dev branch of Diff with a simple git apply, so I re-rolled it as well as the patch against Commons.

This works great in my functional testing.

ezra-g’s picture

ezra-g commented
Status: Needs review » Fixed

This is committed.

Thanks, lightsurge for this suggestion!

http://drupalcode.org/project/commons.git/commit/fd73a09

Status: Fixed » Closed (fixed)

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