diff --git a/src/app/code/community/FireGento/Logger/Model/Observer.php b/src/app/code/community/FireGento/Logger/Model/Observer.php index 37223ca4..ad1cda99 100644 --- a/src/app/code/community/FireGento/Logger/Model/Observer.php +++ b/src/app/code/community/FireGento/Logger/Model/Observer.php @@ -18,6 +18,7 @@ * @copyright 2013 FireGento Team (http://www.firegento.com) * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3) */ + /** * Observer Class * @@ -32,6 +33,11 @@ class FireGento_Logger_Model_Observer extends Varien_Object */ const MAX_FILE_DAYS = 30; + /** + * @var bool + */ + protected $init = true; + /** * Cron job for cleaning firegento log table */ @@ -76,8 +82,8 @@ public function rotateLogs() /** * Get all files which are older than X days and containing a pattern. * - * @param int $days Days - * @param string $dir Directory + * @param int $days Days + * @param string $dir Directory * @param string $filename Filename * @return array */ @@ -137,15 +143,21 @@ public function formatDate($date) */ public function addLoggerJs(Varien_Event_Observer $observer) { - $isHeadBlock = ($observer->getBlock() instanceof Mage_Page_Block_Html_Head); - $isFrontendLoggerActivated = (boolean) Mage::helper('firegento_logger')->getLoggerConfig('general/frontend_logger'); - if ($isHeadBlock && $isFrontendLoggerActivated) { + if ($this->init && Mage::helper('core')->isDevAllowed()) { + $this->init = false; + } + + if ($this->init && $observer->getBlock()->getNameInLayout() === 'head' + && (boolean)Mage::helper('firegento_logger')->getLoggerConfig('general/frontend_logger') + ) { $transport = $observer->getTransport(); $html = $transport->getHtml(); $block = Mage::app()->getLayout()->createBlock('core/template'); $block->setTemplate('firegento_logger/js.phtml'); $html = $block->toHtml() . $html; $transport->setHtml($html); + + $this->init = false; } } } diff --git a/src/app/code/community/FireGento/Logger/etc/config.xml b/src/app/code/community/FireGento/Logger/etc/config.xml index 787d334d..deedb2ec 100644 --- a/src/app/code/community/FireGento/Logger/etc/config.xml +++ b/src/app/code/community/FireGento/Logger/etc/config.xml @@ -271,6 +271,7 @@ confirmation]]> + singleton FireGento_Logger_Model_Observer addLoggerJs diff --git a/src/app/code/community/FireGento/Logger/etc/system.xml b/src/app/code/community/FireGento/Logger/etc/system.xml index 2e8b29ac..aea0b23d 100644 --- a/src/app/code/community/FireGento/Logger/etc/system.xml +++ b/src/app/code/community/FireGento/Logger/etc/system.xml @@ -119,7 +119,8 @@ 1 + send these errors also to the configured logging backend.
/> + Note: only if client is not defined in dev/restrict/allow_ips
]]>