Fixes .../edit&switch_locale=en... bug with copywriting. #1820

Merged
merged 1 commit into from Jul 13, 2012

Conversation

Projects
None yet
3 participants
Contributor

gwagener commented Jul 13, 2012

The error that 8d0c1a7 fixed was not caused by d0cef21, but rather by 4d3488b (the fix for #1397). Previously the first three replace lines had removed things after the ?, but not the ? itself. Then the last two replace lines cleaned up any mess, either a trailing ? or ?&... With the ? removed the last two replace lines did nothing and the result was .../edit&switch_locale=en...

In the 2-0-stable branch 8a457dd reverted 8a457dd, but did not override the fix for #1397 so it didn't actually fix anything.

This change combines the first three lines into one and replaces the last two lines with a regex that replaces the offending & with a ? (but not any subsequent &s or anything if the url is already correct).

This also brings the fix for #1397 into https://github.com/resolve/refinerycms/blob/2-0-stable/core/app/assets/javascripts/refinery/modal_dialogs.js.erb. I think d0cef21 and 8a457dd should be safe to re-submit.

Owner

parndt commented Jul 13, 2012

Good show old chap.

Feel free to re-submit the commit we reverted earlier.

@parndt parndt merged commit 637be40 into refinery:2-0-stable Jul 13, 2012

This pull request fails (merged 637be40 into 01cf674).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment