-
-
Notifications
You must be signed in to change notification settings - Fork 436
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge v19 -> v20 #2766
Merge v19 -> v20 #2766
Conversation
Co-authored-by: sv3n <github-sr@hotmail.com>
#2744 had conflicts |
…ports_Model_Resource_Order_Collection queries for a correct use of Zend_Db_Expr (#2864) * Rewrote Mage_Reports_Model_Resource_Review_Product_Collection query for a correct use of Zend_Db_Expr * Fixed Mage_Reports_Model_Resource_Order_Collection * shouldnt be here
I've synced everything, notes:
|
Sync v20 can be move to next release imho. |
Think we can ignore it for this release. Problems:
... output seems to be to large. Dont know if it is worth to raise an issue at https://github.com/tj-actions/changed-files |
updated this today, still misses #2810 that will be handled separately. please review and let's merge it, it's already too huge. |
just pushed all the new merged PRs on "20.0" branch |
I think there is something wrong on branch 20 for Mage.php: |
So, setIsDownloader was coming from that same PR, this is the commit 7c5b68e The PR was correctly forward ported (it should have been) but we should have modified the v20 version, which we didn't. I now have removed the setIsDownloader which seems to me the only thing we should have done in v20 with PR #2839. |
Cherry picking from v19.4.20...1.9.4.x