search

pressflow / 6

Each version of Pressflow is API-compatible with the same major Drupal version. For example, Pressflow 6 is compatible with all Drupal 6 modules. Pressflow 6 also integrates the SimpleTest system from Drupal 7 and the CDN support patch.
http://pressflow.org/
GNU General Public License v2.0
234 stars 89 forks source link

Merge changes from D6LTS Pressflow fork #131

Open dsnopek opened 5 years ago

dsnopek commented 5 years ago

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!

pwolanin commented 5 years ago

@dsnopek I don't care really about the Changelog myself.