sync up with ZendFramework 1.9.6 which fixes ZF-8046

git-svn-id: http://dev.piwik.org/svn/trunk@1607 59fd770c-687e-43c8-a1e3-f5a4ff64c105

4 files changed, 27 insertions, 27 deletions

diff --git a/libs/Zend/Log/Writer/Abstract.php b/libs/Zend/Log/Writer/Abstract.php
index 3e3be2d6cd..f949d6786a 100644
--- a/libs/Zend/Log/Writer/Abstract.php
+++ b/libs/Zend/Log/Writer/Abstract.php
@@ -104,4 +104,4 @@ abstract class Zend_Log_Writer_Abstract
      */
     abstract protected function _write($event);
 
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Writer/Firebug.php b/libs/Zend/Log/Writer/Firebug.php
index 49eeae9a2d..54616d5009 100644
--- a/libs/Zend/Log/Writer/Firebug.php
+++ b/libs/Zend/Log/Writer/Firebug.php
@@ -17,7 +17,7 @@
  * @subpackage Writer
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Firebug.php 16971 2009-07-22 18:05:45Z mikaelkael $
+ * @version    $Id: Firebug.php 18951 2009-11-12 16:26:19Z alexander $
  */
 
 /** Zend_Log */
@@ -34,7 +34,7 @@ require_once 'Zend/Wildfire/Plugin/FirePhp.php';
 
 /**
  * Writes log messages to the Firebug Console via FirePHP.
- * 
+ *
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
@@ -56,19 +56,19 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
                                        Zend_Log::NOTICE => Zend_Wildfire_Plugin_FirePhp::INFO,
                                        Zend_Log::INFO   => Zend_Wildfire_Plugin_FirePhp::INFO,
                                        Zend_Log::DEBUG  => Zend_Wildfire_Plugin_FirePhp::LOG);
-    
+
     /**
      * The default logging style for un-mapped priorities
      * @var string
-     */    
+     */
     protected $_defaultPriorityStyle = Zend_Wildfire_Plugin_FirePhp::LOG;
-    
+
     /**
      * Flag indicating whether the log writer is enabled
      * @var boolean
      */
     protected $_enabled = true;
-    
+
     /**
      * Class constructor
      */
@@ -77,14 +77,14 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
         if (php_sapi_name()=='cli') {
             $this->setEnabled(false);
         }
-        
+
         $this->_formatter = new Zend_Log_Formatter_Firebug();
     }
-    
+
     /**
      * Enable or disable the log writer.
-     * 
-     * @param boolean $enabled Set to TRUE to enable the log writer 
+     *
+     * @param boolean $enabled Set to TRUE to enable the log writer
      * @return boolean The previous value.
      */
     public function setEnabled($enabled)
@@ -93,43 +93,43 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
         $this->_enabled = $enabled;
         return $previous;
     }
-    
+
     /**
      * Determine if the log writer is enabled.
-     * 
+     *
      * @return boolean Returns TRUE if the log writer is enabled.
      */
     public function getEnabled()
     {
         return $this->_enabled;
     }
-    
+
     /**
      * Set the default display style for user-defined priorities
-     * 
+     *
      * @param string $style The default log display style
      * @return string Returns previous default log display style
-     */    
+     */
     public function setDefaultPriorityStyle($style)
     {
         $previous = $this->_defaultPriorityStyle;
         $this->_defaultPriorityStyle = $style;
         return $previous;
     }
-    
+
     /**
      * Get the default display style for user-defined priorities
-     * 
+     *
      * @return string Returns the default log display style
-     */    
+     */
     public function getDefaultPriorityStyle()
     {
         return $this->_defaultPriorityStyle;
     }
-    
+
     /**
      * Set a display style for a logging priority
-     * 
+     *
      * @param int $priority The logging priority
      * @param string $style The logging display style
      * @return string|boolean The previous logging display style if defined or TRUE otherwise
@@ -146,7 +146,7 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
 
     /**
      * Get a display style for a logging priority
-     * 
+     *
      * @param int $priority The logging priority
      * @return string|boolean The logging display style if defined or FALSE otherwise
      */
@@ -169,15 +169,15 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
         if (!$this->getEnabled()) {
             return;
         }
-      
+
         if (array_key_exists($event['priority'],$this->_priorityStyles)) {
             $type = $this->_priorityStyles[$event['priority']];
         } else {
             $type = $this->_defaultPriorityStyle;
         }
-        
+
         $message = $this->_formatter->format($event);
-        
+
         $label = isset($event['firebugLabel'])?$event['firebugLabel']:null;
 
         Zend_Wildfire_Plugin_FirePhp::getInstance()->send($message,
diff --git a/libs/Zend/Log/Writer/Mock.php b/libs/Zend/Log/Writer/Mock.php
index 2a593c0d9e..d4b9c2bd80 100644
--- a/libs/Zend/Log/Writer/Mock.php
+++ b/libs/Zend/Log/Writer/Mock.php
@@ -63,4 +63,4 @@ class Zend_Log_Writer_Mock extends Zend_Log_Writer_Abstract
     {
         $this->shutdown = true;
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Writer/Null.php b/libs/Zend/Log/Writer/Null.php
index de791d3a99..a070528da4 100644
--- a/libs/Zend/Log/Writer/Null.php
+++ b/libs/Zend/Log/Writer/Null.php
@@ -43,4 +43,4 @@ class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract
     {
     }
 
-}
\ No newline at end of file
+}