[Pkg-mediawiki-commits] r228 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2010-09-07 09:07:17 +0000 (Tue, 07 Sep 2010)
New Revision: 228

Added:
   mediawiki/trunk/debian/patches/fix_datetime.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
I found a genuine bug in MediaWiki (both 1.15.5 and trunk) ?\226?\152?\186
Here?\226?\128?\153s a fix, sponsored by tarent GmbH (sorry, have to say this)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2010-08-12 12:22:24 UTC (rev 227)
+++ mediawiki/trunk/debian/changelog	2010-09-07 09:07:17 UTC (rev 228)
@@ -1,3 +1,11 @@
+mediawiki (1:1.15.5-2) UNRELEASED; urgency=high
+
+  * debian/patches/fix_datetime.patch: new, convert argument into
+    the format expected by other methods, fixes date/time output
+    in e.g. the News/RSS extensions
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 07 Sep 2010 11:04:26 +0200
+
 mediawiki (1:1.15.5-1) unstable; urgency=high
 
   [ Thorsten Glaser ]

Added: mediawiki/trunk/debian/patches/fix_datetime.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_datetime.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_datetime.patch	2010-09-07 09:07:17 UTC (rev 228)
@@ -0,0 +1,30 @@
+$Id$
+
+	Fix obvious bug in the two methods date() and time() to
+	make them match both their documentation and the other
+	method timeanddate() and convert the input timestamp
+	into the format expected by the sprintfDate() method.
+		-- Thorsten Glaser <tg at debian.org>
+
+--- mediawiki-1.15.5/languages/Language.php~	2010-09-07 10:59:22.000000000 +0200
++++ mediawiki-1.15.5/languages/Language.php	2010-09-07 10:59:24.000000000 +0200
+@@ -1268,6 +1268,9 @@ class Language {
+ 	 */
+ 	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
+ 		$this->load();
++
++		$ts = wfTimestamp( TS_MW, $ts );
++
+ 		if ( $adj ) { 
+ 			$ts = $this->userAdjust( $ts, $timecorrection ); 
+ 		}
+@@ -1291,6 +1294,9 @@ class Language {
+ 	 */
+ 	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
+ 		$this->load();
++
++		$ts = wfTimestamp( TS_MW, $ts );
++
+ 		if ( $adj ) { 
+ 			$ts = $this->userAdjust( $ts, $timecorrection ); 
+ 		}


Property changes on: mediawiki/trunk/debian/patches/fix_datetime.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2010-08-12 12:22:24 UTC (rev 227)
+++ mediawiki/trunk/debian/patches/series	2010-09-07 09:07:17 UTC (rev 228)
@@ -5,3 +5,4 @@
 add_rss_guid.patch
 backup_documentation.patch
 suppress_warnings.patch
+fix_datetime.patch