[Pkg-mediawiki-commits] r365 - mediawiki/experimental/debian mediawiki/experimental/debian/patches mediawiki-extensions/experimental/debian mediawiki-extensions/experimental/debian/patches

Thorsten Glaser tg at alioth.debian.org
Fri Aug 3 12:10:57 UTC 2012 

Author: tg
Date: 2012-08-03 12:10:57 +0000 (Fri, 03 Aug 2012)
New Revision: 365

Added:
   mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch
Modified:
   mediawiki-extensions/experimental/debian/changelog
   mediawiki-extensions/experimental/debian/patches/series
   mediawiki/experimental/debian/changelog
   mediawiki/experimental/debian/patches/fix_invalid_sql.patch
   mediawiki/experimental/debian/patches/fix_invalid_xhtml.patch
   mediawiki/experimental/debian/patches/mimetypes.patch
   mediawiki/experimental/debian/patches/suppress_warnings.patch
Log:
apply next bunch of prospective fixes made during EvolvisForge development


Modified: mediawiki/experimental/debian/changelog
===================================================================
--- mediawiki/experimental/debian/changelog	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki/experimental/debian/changelog	2012-08-03 12:10:57 UTC (rev 365)
@@ -1,9 +1,10 @@
-mediawiki (1:1.19.1-2~exp2~1) experimental; urgency=low
+mediawiki (1:1.19.1-2~exp2) experimental; urgency=low
 
   * session_start is another function that needs an explicit ‘@’,
     so bring back that part of suppress_warnings.patch
+  * prevent <ul></ul> without any <li /> inside in MonoBook
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jul 2012 17:51:17 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 03 Aug 2012 14:09:38 +0200
 
 mediawiki (1:1.19.1-2~exp1) experimental; urgency=low
 

Modified: mediawiki/experimental/debian/patches/fix_invalid_sql.patch
===================================================================
--- mediawiki/experimental/debian/patches/fix_invalid_sql.patch	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki/experimental/debian/patches/fix_invalid_sql.patch	2012-08-03 12:10:57 UTC (rev 365)
@@ -1,3 +1,5 @@
+$Id$
+
 Fix invalid SQL: Debian #615983
 | A database error has occurred
 | Query: INSERT IGNORE INTO page_restrictions (pr_page,pr_type,pr_level,pr_cascade,pr_user,pr_expiry) SELECT 793,pr_type,pr_level,pr_cascade,pr_user,pr_expiry FROM page_restrictions WHERE pr_page = '216'
@@ -7,9 +9,9 @@
 | ^
 Reference: https://evolvis.org/tracker/t_follow.php/1377
 
---- mediawiki-1.19.0.orig/includes/Title.php
-+++ mediawiki-1.19.0/includes/Title.php
-@@ -3524,8 +3524,7 @@
+--- a/includes/Title.php
++++ b/includes/Title.php
+@@ -3524,8 +3524,7 @@ class Title {
  					'pr_expiry'  => 'pr_expiry'
  				),
  				array( 'pr_page' => $pageid ),


Property changes on: mediawiki/experimental/debian/patches/fix_invalid_sql.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki/experimental/debian/patches/fix_invalid_xhtml.patch
===================================================================
--- mediawiki/experimental/debian/patches/fix_invalid_xhtml.patch	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki/experimental/debian/patches/fix_invalid_xhtml.patch	2012-08-03 12:10:57 UTC (rev 365)
@@ -4,6 +4,7 @@
 • someone forgot to check whether HTML5 was enabled before toying around
 • let makeLink and all its callers remove HTML5-only attributes from
   hyperlinks if someone else was not careful (rather, several someones)
+• prevent <ul></ul> without any <li /> inside
 
 --- a/includes/HTMLForm.php
 +++ b/includes/HTMLForm.php
@@ -48,3 +49,50 @@
  			$html = Html::rawElement( isset( $attrs['href'] ) ? 'a' : $options['link-fallback'], $attrs, $html );
  		}
  
+--- a/skins/MonoBook.php
++++ b/skins/MonoBook.php
+@@ -60,6 +60,8 @@ class MonoBookTemplate extends BaseTempl
+ 	 * @access private
+ 	 */
+ 	function execute() {
++		global $wgHtml5;
++
+ 		// Suppress warnings to prevent notices about missing indexes in $this->data
+ 		wfSuppressWarnings();
+ 
+@@ -69,7 +71,7 @@ class MonoBookTemplate extends BaseTempl
+ 	<a id="top"></a>
+ 	<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+ 
+-	<h1 id="firstHeading" class="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1>
++	<h1 id="firstHeading" class="firstHeading"><span<?php if ($wgHtml5) echo ' dir="auto"'; ?>><?php $this->html('title') ?></span></h1>
+ 	<div id="bodyContent" class="mw-body">
+ 		<div id="siteSub"><?php $this->msg('tagline') ?></div>
+ 		<div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
+@@ -93,12 +95,21 @@ class MonoBookTemplate extends BaseTempl
+ 	<div class="portlet" id="p-personal">
+ 		<h5><?php $this->msg('personaltools') ?></h5>
+ 		<div class="pBody">
++<?php
++	$ul_shown = false;
++	foreach ($this->getPersonalTools() as $key => $item) {
++		if (!$ul_shown) {
++?>
+ 			<ul<?php $this->html('userlangattributes') ?>>
+-<?php		foreach($this->getPersonalTools() as $key => $item) { ?>
+-				<?php echo $this->makeListItem($key, $item); ?>
+-
+-<?php		} ?>
+-			</ul>
++<?php
++			$ul_shown = true;
++		}
++		echo "\n" . $this->makeListItem($key, $item);
++	}
++	if ($ul_shown) {
++		echo "\n</ul>\n";
++	}
++?>
+ 		</div>
+ 	</div>
+ 	<div class="portlet" id="p-logo">

Modified: mediawiki/experimental/debian/patches/mimetypes.patch
===================================================================
--- mediawiki/experimental/debian/patches/mimetypes.patch	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki/experimental/debian/patches/mimetypes.patch	2012-08-03 12:10:57 UTC (rev 365)
@@ -1,6 +1,8 @@
---- mediawiki-1.19.0.orig/includes/DefaultSettings.php
-+++ mediawiki-1.19.0/includes/DefaultSettings.php
-@@ -879,8 +879,8 @@
+$Id$
+
+--- a/includes/DefaultSettings.php
++++ b/includes/DefaultSettings.php
+@@ -879,8 +879,8 @@ $wgAntivirusRequired = true;
  $wgVerifyMimeType = true;
  
  /** Sets the mime type definition file to use by MimeMagic.php. */


Property changes on: mediawiki/experimental/debian/patches/mimetypes.patch
___________________________________________________________________
Added: svn:keywords
   + Id


Property changes on: mediawiki/experimental/debian/patches/suppress_warnings.patch
___________________________________________________________________
Modified: svn:keywords
   - Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State
   + Id

Modified: mediawiki-extensions/experimental/debian/changelog
===================================================================
--- mediawiki-extensions/experimental/debian/changelog	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki-extensions/experimental/debian/changelog	2012-08-03 12:10:57 UTC (rev 365)
@@ -1,8 +1,9 @@
-mediawiki-extensions (3~exp2~1) experimental; urgency=low
+mediawiki-extensions (3~exp2) experimental; urgency=low
 
   * Fix paths in RSS_Reader extension
+  * Quell those UNIQ‥QINU texts by fixing PageCSS to honour the API
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 01 Aug 2012 16:55:03 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 03 Aug 2012 14:01:29 +0200
 
 mediawiki-extensions (3~exp1) experimental; urgency=low
 

Added: mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch
===================================================================
--- mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch	                        (rev 0)
+++ mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch	2012-08-03 12:10:57 UTC (rev 365)
@@ -0,0 +1,16 @@
+$Id$
+
+Fix PageCSS extension:
+* parser hooks are expected to return strings, not void
+  => fixes those UNIQ...QINU things showing
+
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php
+@@ -38,6 +38,7 @@ class CssHook {
+ </style>
+ EOT
+ 		);
++		return "";
+ 	}
+ 
+ }


Property changes on: mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki-extensions/experimental/debian/patches/series
===================================================================
--- mediawiki-extensions/experimental/debian/patches/series	2012-08-01 14:55:32 UTC (rev 364)
+++ mediawiki-extensions/experimental/debian/patches/series	2012-08-03 12:10:57 UTC (rev 365)
@@ -7,5 +7,6 @@
 fix_inputbox.patch
 fix_interwiki.patch
 fix_languageselector.patch
+fix_pagecss.patch
 fix_rssreader.patch
 news_dont_break_feeds.patch

More information about the Pkg-mediawiki-commits mailing list