Skip to content

Commit

Permalink
Merge pull request #156 from mollie/5.5.3
Browse files Browse the repository at this point in the history
5.5.3
  • Loading branch information
Marvin-Magmodules authored Oct 27, 2019
2 parents eb3a9f4 + 1d4893e commit 5a095d8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion app/code/community/Mollie/Mpm/Model/Mollie.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,13 @@ public function getOrderIdByTransactionId($transactionId)
*/
private function commitOrder(Mage_Sales_Model_Order $order)
{
$systemLogIsDisabled = false;
if (defined('Mage_Log_Helper_Data::XML_PATH_LOG_ENABLED')) {
$systemLogIsDisabled = $this->mollieHelper->getStoreConfig(Mage_Log_Helper_Data::XML_PATH_LOG_ENABLED) == '0';
}

$logObserver = Mage::getConfig()->getNode('frontend/events/controller_action_postdispatch/observers/log');
$logObserverIsDisabled = $logObserver && $logObserver->type == 'disabled';
$systemLogIsDisabled = $this->mollieHelper->getStoreConfig(Mage_Log_Helper_Data::XML_PATH_LOG_ENABLED) == '0';

if (!$logObserverIsDisabled && !$systemLogIsDisabled) {
return;
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Mollie/Mpm/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<config>
<modules>
<Mollie_Mpm>
<version>5.5.2</version>
<version>5.5.3</version>
</Mollie_Mpm>
</modules>
<global>
Expand Down

0 comments on commit 5a095d8

Please sign in to comment.