Forward port #2810 #2885
Closed
Forward port #2810 #2885
Conversation
This file contains 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
tmotyl
reviewed
Jan 3, 2023
| @@ -441,42 +441,42 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract | |||
| protected $_eventObject = 'order'; | |||
|
|
|||
| /** | |||
| * @var Mage_Sales_Model_Resource_Order_Address_Collection|Mage_Sales_Model_Order_Address[]|null | |||
tmotyl
reviewed
Jan 3, 2023
tmotyl
reviewed
Jan 3, 2023
tmotyl
reviewed
Jan 3, 2023
| } | ||
| } | ||
| return $items; | ||
| } | ||
|
|
||
| /** | ||
| * @param int $itemId | ||
| * @return Mage_Sales_Model_Order_Item|null |
There was a problem hiding this comment.
keep as is in v20 (and maybe backport this change to v19?)
tmotyl
reviewed
Jan 3, 2023
tmotyl
reviewed
Jan 3, 2023
| @@ -115,14 +111,12 @@ public function _construct() | |||
| * Init mapping array of short fields to | |||
| * its full names | |||
| * | |||
| * @return $this | |||
There was a problem hiding this comment.
keep as is in v20, and backport to v19
tmotyl
reviewed
Jan 3, 2023
tmotyl
reviewed
Jan 3, 2023
|
added comments, most of the changes should not be applied on v20. |
|
@fballiano I don't see a point in reverting #2810 . |
|
@tmotyl I think I fixed all your comments. At this point I don't understand what this PR was about. |
|
i'm closing this one since i don't know wth i should do |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#2810 was left out of #2766 because of conflicts, here's the merge in its own PR, please check :-)