Duplicate $live_revision->revision assignment in workbench_moderation_store() [#2421009]

The 7.x-1.x commits from the following issues added $live_revision->revision = 0 during workbench_moderation_store().

#1436260: Saving nodes outside Workbench Moderation leads to incorrect state transitions (e.g., "needs review" appearing as published)
#2308095: URL alias reverts to Automatic generate alias when published

Only one is required. Patch to remove the extraneous one to follow. Thanks!

Comment	File	Size	Author
#5	workbench_moderation-workbench_moderation_store_cleanup-2421009-5.patch	371 bytes	jbylsma
#5
#1	workbench_moderation-workbench_moderation_store_cleanup-2421009-2.patch	410 bytes	jbylsma
#1

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

File	Size
workbench_moderation-workbench_moderation_store_cleanup-2421009-2.patch	410 bytes

Comment #2

17 March 2015 at 19:59

Status:

Needs review

» Needs work

The last submitted patch, 1: workbench_moderation-workbench_moderation_store_cleanup-2421009-2.patch, failed testing.

Comment #3

ladybug_3777 CreditAttribution: ladybug_3777 commented 24 March 2015 at 19:45

The issue is bigger than this. That patch you referenced changes the behavior of pathauto and it shouldn't. I believe that entire patch needs to be backed out. I left a comment on this post with more detail: https://www.drupal.org/node/2308095

Comment #4

ladybug_3777 CreditAttribution: ladybug_3777 commented 25 March 2015 at 15:32

Status:

Needs work

» Closed (duplicate)

Marking this as a duplicate of the issue that should be reverted: https://www.drupal.org/node/2308095

Comment #5

jbylsma CreditAttribution: jbylsma commented 25 March 2015 at 16:08

Status:

Closed (duplicate)

» Needs review

File	Size
workbench_moderation-workbench_moderation_store_cleanup-2421009-5.patch	371 bytes

This is not a duplicate, and the patch provided does not address the Pathauto issue. There is a duplicate $node->live_revision assignment in workbench_moderation_store(), just minor clean up. I think reverting the Pathauto issue will be tricky and manual, so I believe this patch is still applicable.

Rerolled patch attached.

Comment #6

ladybug_3777 CreditAttribution: ladybug_3777 commented 25 March 2015 at 18:10

This patch is a duplicate because you are trying to write a patch against something that needs to be reverted. The original code that caused you to raise this issue shouldn't exist in Workbench Moderation AT ALL.

Issue #2308095: CAUSED this extraneous line but it also added in pathauto logic. BOTH of those things are wrong. If issue 230895 is reverted, your patch no longer applies. Make sense?

Maybe you might also be missing that issue 230895 is an already committed patch. It's not a NEW patch we are trying to apply, its a patch we are discussing REMOVING/REVERTING.

Comment #7

ladybug_3777 CreditAttribution: ladybug_3777 commented 25 March 2015 at 18:09

Status:

Needs review

» Closed (duplicate)

Comment #8

jbylsma CreditAttribution: jbylsma commented 25 March 2015 at 19:05

Yes, it makes sense, but before there was a removal patch over in #2308095: URL alias reverts to Automatic generate alias when published, this wasn't duplicating anything. Nitpicky, I know. With the removal patch posted, I will graciously keep the duplicate status :)