--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: mediawiki-extensions/2.8
- From: Thorsten Glaser <tg@mirbsd.de>
- Date: Sat, 29 Sep 2012 17:50:51 +0200
- Message-id: <20120929155051.10515.34334.reportbug@evolvis-51.tarent.de>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package mediawiki-extensions
This unblock request also comes as a follow-up to the thread at
http://article.gmane.org/gmane.linux.debian.devel.release/56559
as discusses earlier.
As for diffs: mediawiki-extensions/2.7 was the first version to
properly work with MediaWiki 1.19, 2.6 and below were for 1.15,
and, despite some trickery leading to 2.6+wheezy1, are not at
all suitable for it (I said in #686190 that it was just the be‐
ginning, and #687641 being filed proved me right).
Furthermore, mediawiki-extensions/2.7 was waiting for migration
to testing for more than 60 (sixty) days already, depending in‐
directly on nodejs due to ECMAscript compression and one of the
affected libraries being a dependency¹, and the JS packagers as
well as I were under the impression, all the time, that we could
have this fixed for wheezy, until being told, IMO much too late,
that this would not be accepted. So I respectfully ask that the
Release Team consider mediawiki-extensions/2.7 already accepted
and just not transitioned due to misinformation.
① As it turns out, that dependency was not even needed in the
end; the 2.8 upload removes it. But I was left in good faith
that 2.7 would transition as-is, and we could fix all follow-
up problems later.
Therefore I consider the upgrade to MW-Extensions 2.8 critical
to the release (as otherwise, peoples’ wikis will either not
work at all and/or show weird error messages, or, if the media‐
wiki/1:1.19.2-1 upload is accepted, their extensions will find
themselves deinstalled, which will make them unhappy, and pos‐
sibly also break their installations).
As for the fixes happening between 2.7 and 2.8, they occurred
during preparing the integration of FusionForge and MW 1.19 in
a semi-production environment. The RSS_Reader extension was
fully broken, PageCSS produced spurious text in wiki pages,
and Collection and InputBox produced invalid XHTML. The diff,
again with quilt patches applied instead of showing a diff
between unidiffs, follows:
--- mediawiki-extensions-2.7/debian/changelog 2012-06-29 17:55:21.000000000 +0200
+++ mediawiki-extensions-2.8/debian/changelog 2012-09-20 13:45:26.000000000 +0200
@@ -1,3 +1,15 @@
+mediawiki-extensions (2.8) unstable; urgency=low
+
+ * Remove dependency of mw-ext-collection on various ECMAscript
+ libraries that apparently are available from MW core already
+ (as log message for r87847 suggests); enables testing transition
+ * Fix paths in RSS_Reader extension
+ * Quell those UNIQ‥QINU texts by fixing PageCSS to honour the API
+ * Fix content-less ul element in Collection extension
+ * Fix invalid XHTML in InputBox extension
+
+ -- Thorsten Glaser <tg@mirbsd.de> Thu, 20 Sep 2012 13:40:12 +0200
+
mediawiki-extensions (2.7) unstable; urgency=low
* Target MediaWiki 1.19
--- mediawiki-extensions-2.7/debian/control 2012-06-29 17:55:21.000000000 +0200
+++ mediawiki-extensions-2.8/debian/control 2012-09-20 13:45:26.000000000 +0200
@@ -104,8 +104,7 @@ Description: Extensions for MediaWiki --
Package: mediawiki-extensions-collection
Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- libjs-jquery, libjs-jquery-ui, libjs-json, php5-curl
+Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
Description: Extensions for MediaWiki -- Collection extension
This package provides the mediawiki extensions for
creating books using collections of pages.
--- mediawiki-extensions-2.7/debian/control.in 2012-06-29 17:50:22.000000000 +0200
+++ mediawiki-extensions-2.8/debian/control.in 2012-09-20 13:45:26.000000000 +0200
@@ -104,8 +104,7 @@ Description: Extensions for MediaWiki --
Package: mediawiki-extensions-collection
Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- libjs-jquery, libjs-jquery-ui, libjs-json, php5-curl
+Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
Description: Extensions for MediaWiki -- Collection extension
This package provides the mediawiki extensions for
creating books using collections of pages.
--- mediawiki-extensions-2.7/debian/mediawiki-extensions-collection.links 2012-06-29 16:16:17.000000000 +0200
+++ mediawiki-extensions-2.8/debian/mediawiki-extensions-collection.links 2012-09-20 13:45:26.000000000 +0200
@@ -1,5 +1,2 @@
usr/share/mediawiki-extensions/collection var/lib/mediawiki/extensions/Collection
usr/share/mediawiki-extensions/collection/Collection.php etc/mediawiki-extensions/extensions-available/Collection.php
-usr/share/javascript/jquery-ui/jquery-ui.js usr/share/mediawiki-extensions/collection/collection/jquery.ui.js
-usr/share/javascript/jquery/jquery.js usr/share/mediawiki-extensions/collection/collection/jquery.js
-usr/share/javascript/json/json2.min.js usr/share/mediawiki-extensions/collection/collection/json2.js
--- mediawiki-extensions-2.7/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php 2012-06-29 16:46:19.000000000 +0200
+++ mediawiki-extensions-2.8/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php 2012-09-29 17:49:00.000000000 +0200
@@ -74,6 +74,7 @@ class InputBox {
*/
public function getSearchForm( $type ) {
global $wgContLang, $wgNamespaceAliases;
+ global $wgHtml5;
// Use button label fallbacks
if ( !$this->mButtonLabel ) {
@@ -98,15 +99,19 @@ class InputBox {
'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
)
);
- $htmlOut .= Xml::element( 'input',
- array(
+ $tmpa = array(
'class' => 'searchboxInput',
'name' => 'search',
'type' => $this->mHidden ? 'hidden' : 'text',
'value' => $this->mDefaultText,
'placeholder' => $this->mPlaceholderText,
'size' => $this->mWidth,
- )
+ );
+ if (!$wgHtml5) {
+ unset($tmpa['placeholder']);
+ }
+ $htmlOut .= Xml::element( 'input',
+ $tmpa
);
if( $this->mPrefix != '' ){
@@ -302,6 +307,7 @@ class InputBox {
*/
public function getCreateForm() {
global $wgScript;
+ global $wgHtml5;
if ( $this->mType == "comment" ) {
if ( !$this->mButtonLabel ) {
@@ -387,15 +393,19 @@ class InputBox {
)
);
}
- $htmlOut .= Xml::openElement( 'input',
- array(
+ $tmpa = array(
'type' => $this->mHidden ? 'hidden' : 'text',
'name' => 'title',
'class' => 'createboxInput',
'value' => $this->mDefaultText,
'placeholder' => $this->mPlaceholderText,
'size' => $this->mWidth
- )
+ );
+ if (!$wgHtml5) {
+ unset($tmpa['placeholder']);
+ }
+ $htmlOut .= Xml::openElement( 'input',
+ $tmpa
);
$htmlOut .= $this->mBR;
$htmlOut .= Xml::openElement( 'input',
@@ -418,6 +428,7 @@ class InputBox {
*/
public function getCommentForm() {
global $wgScript;
+ global $wgHtml5;
if ( !$this->mButtonLabel ) {
$this->mButtonLabel = wfMsgHtml( "postcomment" );
@@ -460,15 +471,19 @@ class InputBox {
'value' => $this->mEditIntro,
)
);
- $htmlOut .= Xml::openElement( 'input',
- array(
+ $tmpa = array(
'type' => $this->mHidden ? 'hidden' : 'text',
'name' => 'preloadtitle',
'class' => 'commentboxInput',
'value' => $this->mDefaultText,
'placeholder' => $this->mPlaceholderText,
'size' => $this->mWidth
- )
+ );
+ if (!$wgHtml5) {
+ unset($tmpa['placeholder']);
+ }
+ $htmlOut .= Xml::openElement( 'input',
+ $tmpa
);
$htmlOut .= Xml::openElement( 'input',
array(
--- mediawiki-extensions-2.7/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php 2012-06-29 16:46:19.000000000 +0200
+++ mediawiki-extensions-2.8/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php 2012-09-29 17:49:00.000000000 +0200
@@ -38,6 +38,7 @@ class CssHook {
</style>
EOT
);
+ return "";
}
}
--- mediawiki-extensions-2.7/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2012-09-29 17:49:02.000000000 +0200
+++ mediawiki-extensions-2.8/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2012-09-29 17:49:00.000000000 +0200
@@ -34,7 +34,7 @@ $wgExtensionCredits['parserhook'][] = ar
### Global Variables ###
//path to follow for server scripts
-$egRSSReaderPath = $wgScriptPath."/extensions/RSSReader";
+$egRSSReaderPath = $wgScriptPath."/extensions/RSS_Reader";
$egCacheTime = 3600; //default cache time in seconds
$egCacheTimeMin = 1800; //minimum cache time in seconds
$egCacheTimeMax = 7200; //maximum cache time in seconds
@@ -158,7 +158,7 @@ function efCreateRSSReader($input, $argv
$wgOut->addLink(array(
'rel' => 'stylesheet',
'type' => 'text/css',
- 'href' => "egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
+ 'href' => "$egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
));
if (!$width) {
--- mediawiki-extensions-2.7/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php 2012-09-29 17:49:02.000000000 +0200
+++ mediawiki-extensions-2.8/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php 2012-09-29 17:49:00.000000000 +0200
@@ -215,11 +215,15 @@ if ( count( $this->data['collection']['i
</div>
<?php } ?>
-<ul id="collectionList">
-
<?php
+$ul_shown = false;
foreach ( $this->data['collection']['items'] as $index => $item ) {
- if ( $item['type'] == 'article' ) { ?>
+ if ( $item['type'] == 'article' ) {
+ if (!$ul_shown) {
+ echo '<ul id="collectionList">' . "\n";
+ $ul_shown = true;
+ }
+?>
<li id="item-<?php echo intval( $index ) ?>" class="article">
<a onclick="return coll_remove_item(<?php echo intval( $index ) ?>)" href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', array( 'bookcmd' => 'remove_item', 'index' => $index ) ) ) ?>" title="<?php $this->msg( 'coll-remove' ) ?>"><img src="<?php echo htmlspecialchars( $mediapath . "remove.png" ) ?>" width="10" height="10" alt="<?php $this->msg( 'coll-remove' ) ?>" /></a>
<noscript>
@@ -269,8 +273,11 @@ foreach ( $this->data['collection']['ite
<a class="makeVisible" <?php if ( !isset( $this->data['is_ajax'] ) ) { echo 'style="display:none"'; } ?> onclick="<?php echo htmlspecialchars( 'return coll_rename_chapter(' . intval( $index ) . ', ' . Xml::encodeJsVar( $item['title'] ) . ')' ) ?>" href="javascript:void(0)">[<?php $this->msg( 'coll-rename' ) ?>]</a>
</li>
<?php }
-} ?>
-</ul>
+}
+if ($ul_shown) {
+ echo "</ul>\n";
+}
+?>
</div>
unblock mediawiki-extensions/2.8
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-3-686-pae (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/mksh-static
--- End Message ---