Merge changes from D6LTS Pressflow fork #131
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just merging the latest D6LTS changes from the D6LTS projects Pressflow fork. It's mostly the just the D6LTS changes themselves, but it looks like where we diverged was on the CHANGELOG.txt.
We ended up swapping out the original Pressflow changelog for ours, so that (in most cases) the same patches could be easily applied to be both D6LTS and Pressflow without conflicts.
If this PR won't be merged because of that, I could revert that change. When patches touch parts of the code that are different between vanilla Drupal and Pressflow, then separate patches are needed anyway, but it's nice that in most cases we can get away with just one patch. :-)
Please let me know what you think!