Skip to content
Permalink
Browse files

Merge branch 'b-6.x'

  • Loading branch information...
Sieg committed Mar 26, 2019
2 parents a9a51aa + 9cca87c commit d28beedbe0bbb3ddc9a0a427e4c5dd8d760e27e7
Showing with 3 additions and 0 deletions.
  1. +1 −0 CHANGELOG.md
  2. +2 −0 source/Core/Email.php
@@ -125,6 +125,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Split config parameter initialization from application initialization [PR-628](https://github.com/OXID-eSales/oxideshop_ce/pull/628)
- Increase default quantity of productimages to 12 (from 7) [PR-514](https://github.com/OXID-eSales/oxideshop_ce/pull/514)
- Make adding template blocks more fast andn reliable [PR-580](https://github.com/OXID-eSales/oxideshop_ce/pull/580)
- Change email encoding to base64 [0006468](https://bugs.oxid-esales.com/view.php?id=6468) [PR-697](https://github.com/OXID-eSales/oxideshop_ce/pull/697)
- Support PHP 7.2
- Modules will not be disabled on class loading errors anymore, Error is just logged [PR-661](https://github.com/OXID-eSales/oxideshop_ce/pull/661)
- Backwards compatibility break: `\OxidEsales\EshopCommunity\Application\Model\User::_dbLogin` will only called until the user successfully logs in the
@@ -302,6 +302,8 @@ public function __construct()
$this->setLanguage("en", $myConfig->getConfigParam('sShopDir') . "/Core/phpmailer/language/");
$this->_getSmarty();
$this->Encoding='base64';
}
/**

0 comments on commit d28beed

Please sign in to comment.
You can’t perform that action at this time.