Backported #1525

[fballiano]

Since it's not the first time I'm dealing with a merge conflict regarding these files, I thought we could maybe backport #1525 to avoid having that as difference between v19 and v20.

What do you think?

[sreichel]

@fballiano pls lt me try something ... if it goes wrong we need a new PR 😎

[Flyingmana]

I would say no, because its a BC break.
Is there a list with changes, which did cause this conflicts? and were they bugfixes or other changes?

[sreichel]

I would say no, because its a BC break.

I changed the code to avoid BC breaks. Please review.

(can make a new PR if wanted)

[sreichel]

Is there a list with changes, which did cause this conflicts?

v19 only

• changed in v20 Make overrides of Mage_Core_Model_Resource_Db_Abstract::delete respect parent api #1257

  message: "#^Return type \\(bool\\) of method Mage_Api_Model_Resource_User\\:\\:delete\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Db_Abstract\\)\\) of method Mage_Core_Model_Resource_Db_Abstract\\:\\:delete\\(\\)$#"
  path: app/code/core/Mage/Api/Model/Resource/User.php
  

• changed in v20 Reduce needless saves by avoiding setting _hasDataChanges flag #2066

  message: "#^If condition is always true\\.$#"
  path: app/code/core/Mage/Core/Model/Abstract.php
  

v20 only

Some are related to #2066 ...

WIP ... will update later ..

[fballiano]

closing, v19 will freeze sometimes soon anyway