From 54026e1c0d79b56d4fc1c40d4ceeb16ab0a557ee Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 10 Oct 2015 15:31:43 +0200
Subject: [PATCH] Fix warnings that cause problems (errors out) in developer
mode
---
.../community/OpenTools/Ordernumber/Helper/Data.php | 10 +++++++---
.../OpenTools/Ordernumber/Model/Backend/Counters.php | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/code/community/OpenTools/Ordernumber/Helper/Data.php b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
index 026b997..cd94928 100644
--- a/app/code/community/OpenTools/Ordernumber/Helper/Data.php
+++ b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
@@ -3,9 +3,13 @@ class OpenTools_Ordernumber_Helper_Data extends Mage_Core_Helper_Abstract
{
public function logitem($label, $item)
{
- Mage::Log($label . " " . get_class($item) . "\n", null, 'ordernumber.log');
- Mage::Log(is_array($item)?$item:$item->debug(), null, 'ordernumber.log');
- Mage::Log(get_class_methods(get_class($item)), null, 'ordernumber.log');
+ if (is_array($item)) {
+ Mage::Log($item, null, 'ordernumber.log');
+ } else {
+ Mage::Log($label . " " . get_class($item) . "\n", null, 'ordernumber.log');
+ Mage::Log($item->debug(), null, 'ordernumber.log');
+ Mage::Log(get_class_methods(get_class($item)), null, 'ordernumber.log');
+ }
}
/* Return a random "string" of the given length taken from the given alphabet */
diff --git a/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php b/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
index 80cdb40..c58d6af 100644
--- a/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
@@ -24,6 +24,9 @@ class OpenTools_Ordernumber_Model_Backend_Counters extends Mage_Core_Model_Confi
$helper = Mage::helper('ordernumber');
$session = Mage::getSingleton('core/session');
if (is_array($vals)) {
+ if (!isset($vals['counter'])) $vals['counter'] = array();
+ if (!isset($vals['new_counter_type'])) $vals['new_counter_type'] = array();
+ if (!isset($vals['deletecounter'])) $vals['deletecounter'] = array();
// $helper->logitem("counter form values: ", $vals);
$model = $this->getModel();
// First, handle new counters
@@ -91,6 +94,7 @@ class OpenTools_Ordernumber_Model_Backend_Counters extends Mage_Core_Model_Confi
$session->addSuccess($helper->__('Successfully deleted counter \'%s\' (type: %s, scope: %s) with value %d',
$counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $counter->getCount()));
}
+ $this->setValue('');
}
}
}
--
GitLab