svn commit: r1302163 - in /logging/log4php/trunk/src: main/php/pattern/LoggerPatternConverterDate.php test/php/pattern/LoggerPatternConverterTest.php

[ihabunek]

Author: ihabunek
Date: Sun Mar 18 16:49:22 2012
New Revision: 1302163

URL: http://svn.apache.org/viewvc?rev=1302163&view=rev
Log:
Fixed a bug where the date pattern would not default to 'c' format if no format 
was given.

Modified:
    logging/log4php/trunk/src/main/php/pattern/LoggerPatternConverterDate.php
    logging/log4php/trunk/src/test/php/pattern/LoggerPatternConverterTest.php

Modified: 
logging/log4php/trunk/src/main/php/pattern/LoggerPatternConverterDate.php
URL: 
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/pattern/LoggerPatternConverterDate.php?rev=1302163&r1=1302162&r2=1302163&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/pattern/LoggerPatternConverterDate.php 
(original)
+++ logging/log4php/trunk/src/main/php/pattern/LoggerPatternConverterDate.php 
Sun Mar 18 16:49:22 2012
@@ -51,7 +51,7 @@ class LoggerPatternConverterDate extends
        public function activateOptions() {
                
                // Parse the option (date format)
-               if (isset($this->option)) {
+               if (!empty($this->option)) {
                        if(isset($this->specials[$this->option])) {
                                $this->format = $this->specials[$this->option];
                        } else {

Modified: 
logging/log4php/trunk/src/test/php/pattern/LoggerPatternConverterTest.php
URL: 
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/pattern/LoggerPatternConverterTest.php?rev=1302163&r1=1302162&r2=1302163&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/pattern/LoggerPatternConverterTest.php 
(original)
+++ logging/log4php/trunk/src/test/php/pattern/LoggerPatternConverterTest.php 
Sun Mar 18 16:49:22 2012
@@ -19,7 +19,7 @@
  * @package    log4php
  * @subpackage filters
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License, 
Version 2.0
- * @version    SVN: $Id$
+ * @version    $Revision$
  * @link       http://logging.apache.org/log4php
  */
 
@@ -82,6 +82,11 @@ class LoggerPatternConverterTest extends
                $actual = $converter->convert($this->event);
                $expected = date('c', $this->event->getTimeStamp());
                self::assertSame($expected, $actual);
+               
+               $converter = new LoggerPatternConverterDate($this->info, '');
+               $actual = $converter->convert($this->event);
+               $expected = date('c', $this->event->getTimeStamp());
+               self::assertSame($expected, $actual);
 
                // Test ABSOLUTE
                $converter = new LoggerPatternConverterDate($this->info, 
'ABSOLUTE');