Ticket #28992: mysql2date.patch

src/wp-includes/functions.php

@@ -21 +21 @@
  * @param string $format    Format of the date to return.
  * @param string $date      Date string to convert.
  * @param bool   $translate Whether the return date should be translated. Default true.
- * @return string|int Formatted date string, or Unix timestamp.
+ * @return string|int|false Formatted date string, or Unix timestamp or false if bad param passed.
  */
 function mysql2date( $format, $date, $translate = true ) {
-        if ( empty( $date ) )
+        if ( empty( $format ) || empty( $date )) {
                 return false;
+        }
 
+        $i = strtotime( $date );
+
+        if(false == $i){
+                return false;
+        }
+
         if ( 'G' == $format )
                 return strtotime( $date . ' +0000' );
 
-        $i = strtotime( $date );
-
         if ( 'U' == $format )
                 return $i;
 

tests/phpunit/tests/functions/mysql2date.php

@@ +1 @@
+<?php
+
+/**
+ * Test wp_filter_object_list(), wp_list_filter(), wp_list_pluck().
+ *
+ * @group functions.php
+ */
+/**
+ * Convert given date string into a different format.
+ *
+ * $format should be either a PHP date format string, e.g. 'U' for a Unix
+ * timestamp, or 'G' for a Unix timestamp assuming that $date is GMT.
+ *
+ * If $translate is true then the given date and format string will
+ * be passed to date_i18n() for translation.
+ *
+ * @since 0.71
+ *
+ * @param string $format Format of the date to return.
+ * @param string $date Date string to convert.
+ * @param bool $translate Whether the return date should be translated. Default true.
+ *
+ * @return string|int Formatted date string, or Unix timestamp.
+ */
+//function mysql2date( $format, $date, $translate = true ) {
+//      if ( empty( $date ) )
+//              return false;
+//
+//      if ( 'G' == $format )
+//              return strtotime( $date . ' +0000' );
+//
+//      $i = strtotime( $date );
+//
+//      if ( 'U' == $format )
+//              return $i;
+//
+//      if ( $translate )
+//              return date_i18n( $format, $i );
+//      else
+//              return date( $format, $i );
+//}
+
+
+class Tests_Functions_mysql2date extends WP_UnitTestCase {
+
+        function test_mysql2date_false() {
+                $this->assertFalse( mysql2date( '', '' ) );
+                $this->assertFalse( mysql2date( '', '2012-12-30' ) );
+                $this->assertFalse( mysql2date( 'Y-m-d', '' ) );
+
+                // must be valid date
+                $this->assertFalse( mysql2date( 'Y-m-d', '42351234523541345143534534535314' ) );
+                $this->assertFalse( mysql2date( 'Y-m-d', '1' ) );
+                $this->assertFalse( mysql2date( 'Y-m-d', '1355270400' ) ); // unix date does work
+
+                $this->assertFalse( mysql2date( 'Y-m-d', 'i am not a date' ) );
+
+
+        }
+
+
+        function test_mysql2date() {
+                $formated_now = date( 'Y-m-d' );
+
+                $this->assertEquals( '2012-12-30', mysql2date( 'Y-m-d', '2012-12-30' ) );
+                $this->assertEquals( '12-12-30',   mysql2date( 'y-m-d', '2012-12-30' ) );
+                $this->assertEquals( '1356825600', mysql2date( 'G', '2012-12-30' ) );
+                $this->assertEquals( '2012-12-30', mysql2date( 'Y-m-d', '2012-12-30', true ) );
+                $this->assertEquals( '2012-12-30', mysql2date( 'Y-m-d', '2012-12-30', false ) );
+
+                $this->assertEquals( '2012-12-30', mysql2date( 'Y-m-d', 'December 30, 2012, 12:00 am' ) );
+
+
+                $this->assertEquals( '1356825600', mysql2date( 'U', '2012-12-30' ) );
+
+                $this->assertEquals( $formated_now, mysql2date( 'Y-m-d', 'today' ) );
+                $this->assertNotEquals( $formated_now, mysql2date( 'Y-m-d', 'tomorrow' ) );
+
+
+                $this->assertEquals( 'December 30, 2012, 12:00 am', mysql2date( 'F j, Y, g:i a', '2012-12-30' ) );
+                // no change on the phpunit as testing in english
+                $this->assertEquals( 'December 30, 2012, 12:00 am', mysql2date( 'F j, Y, g:i a', '2012-12-30' ), true );
+
+        }
+
+}
+ No newline at end of file