Merge branch 'hotfix/ZF-9197' of https://github.com/thomasweidner/zf2 …

…into hotfix/zf-9197

Conflicts:
	library/Zend/Filter/InputFilter.php
	tests/Zend/Filter/InputTest.php

test/Writer/FirebugTest.php

@@ -44,8 +44,15 @@ class FirebugTest extends \PHPUnit_Framework_TestCase
     protected $_writer = null;
     protected $_logger = null;
 
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
     public function setUp()
     {
+        $this->_originaltimezone = date_default_timezone_get();
         date_default_timezone_set('America/Los_Angeles');
 
         // Reset front controller to reset registered plugins and
@@ -74,6 +81,7 @@ public function tearDown()
     {
         Channel\HttpHeaders::destroyInstance();
         FirePhp::destroyInstance();
+        date_default_timezone_set($this->_originaltimezone);
     }
 
     /**
@@ -206,9 +214,9 @@ public function testAdvancedLogging()
         $table = array(
             'Summary line for the table',
             array(
-		        array('Column 1', 'Column 2'),
-		        array('Row 1 c 1',' Row 1 c 2'),
-		        array('Row 2 c 1',' Row 2 c 2')
+                array('Column 1', 'Column 2'),
+                array('Row 1 c 1',' Row 1 c 2'),
+                array('Row 2 c 1',' Row 2 c 2')
             )
         );