[Pkg-mediawiki-commits] r344 - in mediawiki-extensions/branches/experimental/debian: . patches
Thorsten Glaser
tg at alioth.debian.org
Fri Jun 29 15:38:56 UTC 2012
Author: tg
Date: 2012-06-29 15:38:56 +0000 (Fri, 29 Jun 2012)
New Revision: 344
Removed:
mediawiki-extensions/branches/experimental/debian/patches/fix_ldapauth.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_newestpages.patch
Modified:
mediawiki-extensions/branches/experimental/debian/changelog
mediawiki-extensions/branches/experimental/debian/patches/fix_472283.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_collection.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_createbox.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_fckeditor.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_footnote.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_graphviz.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_interwiki.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_languageselector.patch
mediawiki-extensions/branches/experimental/debian/patches/fix_rssreader.patch
mediawiki-extensions/branches/experimental/debian/patches/news_dont_break_feeds.patch
mediawiki-extensions/branches/experimental/debian/patches/series
Log:
refresh all patches with my new ~/.quiltrc from
?\226?\128?\163 https://www.mirbsd.org/cvs.cgi/contrib/hosted/tg/deb/dot.quiltrc?rev=HEAD
and throw away those no longer needed; reorder a bit
Modified: mediawiki-extensions/branches/experimental/debian/changelog
===================================================================
--- mediawiki-extensions/branches/experimental/debian/changelog 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/changelog 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,10 +1,10 @@
-mediawiki-extensions (2.6exp1~) experimental; urgency=low
+mediawiki-extensions (2.7) experimental; urgency=low
* Target MediaWiki 1.19 (currently in experimental)
* Replace courtesy copy of libjs-json in mw-e-collection
- * Update extension code
+ * Update extensions codes and quilt refresh all patches
- -- Thorsten Glaser <tg at mirbsd.de> Fri, 29 Jun 2012 16:45:42 +0200
+ -- Thorsten Glaser <tg at mirbsd.de> Fri, 29 Jun 2012 17:37:35 +0200
mediawiki-extensions (2.6) unstable; urgency=low
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_472283.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_472283.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_472283.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,16 +1,15 @@
Prevent searches with empty search string.
-Index: trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:24:27.000000000 +0200
-@@ -131,7 +131,8 @@
- }
+--- a/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
++++ b/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
+@@ -497,7 +497,10 @@ class LdapAuthenticationPlugin extends A
+ $ret = true;
+ } else {
+ // Search for the entry.
++ $entry = false;
++ if ($searchstring != '') {
+ $entry = LdapAuthenticationPlugin::ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
++ }
- //Search for the entry.
-- $entry = @ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
-+ if ( $searchstring != '' )
-+ $entry = @ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
-
- //getSearchString is going to bind, but will not unbind
- //Let's clean up
+ if ( $entry ) {
+ $this->printDebug( "Found a matching user in LDAP", NONSENSITIVE );
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_collection.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_collection.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_collection.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -3,34 +3,32 @@
Fix Collection extension:
• Invalid XHTML nesting
-Index: trunk/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php 2009-03-05 17:48:46.000000000 +0100
-+++ trunk/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php 2012-03-15 12:26:29.000000000 +0100
-@@ -86,7 +86,7 @@
- $buttonLabel = wfMsgHtml('coll-download');
- } ?>
- <form id="downloadForm" action="<?php echo htmlspecialchars(SkinTemplate::makeSpecialUrlSubpage('Book', 'render/')) ?>" method="post">
-- <table style="width:100%; background-color: transparent;"><tr><td><tbody><tr><td>
-+ <table style="width:100%; background-color: transparent;"><tbody><tr><td>
- <?php if (count($this->data['formats']) == 1) { ?>
- <input type="hidden" name="writer" value="<?php echo htmlspecialchars($writer) ?>" />
+--- a/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
++++ b/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
+@@ -101,7 +101,7 @@ echo $GLOBALS['wgOut']->parse( '{{:' . $
+ $buttonLabel = wfMsgHtml( 'coll-download' );
+ } ?>
+ <form id="downloadForm" action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post">
+- <table style="width:100%; background-color: transparent;"><tr><td><tbody><tr><td>
++ <table style="width:100%; background-color: transparent;"><tbody><tr><td>
+ <?php if ( count( $this->data['formats'] ) == 1 ) { ?>
+ <input type="hidden" name="writer" value="<?php echo htmlspecialchars( $writer ) ?>" />
<?php } else { ?>
-@@ -139,7 +139,7 @@
- <?php } // autoconfirmed ?>
- <tr><td> </td><td style="text-align:right;">
- <input id="saveButton" type="submit" value="<?php $this->msg('coll-save_collection') ?>"<?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> />
-- </tr>
-+ </td></tr>
- </table>
+@@ -165,7 +165,7 @@ echo $GLOBALS['wgOut']->parse( '{{:' . $
+ <?php } // if ($canSaveCommunityPage) ?>
+ <tr><td> </td><td id="collection-save-button">
+ <input id="saveButton" type="submit" value="<?php $this->msg( 'coll-save_collection' ) ?>"<?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> />
+- </tr></tbody></table>
++ </td></tr></tbody></table>
+ <input name="token" type="hidden" value="<?php echo htmlspecialchars( $GLOBALS['wgUser']->editToken() ) ?>" />
+ <input name="bookcmd" type="hidden" value="save_collection" />
</form>
-
-@@ -195,7 +195,7 @@
- foreach($this->data['collection']['items'] as $index => $item) {
- if ($item['type'] == 'article') { ?>
- <li id="item-<?php echo $index ?>" class="article">
-- <a onclick="return coll_remove_item(<?php echo $index ?>)" href="<?php echo htmlspecialchars(SkinTemplate::makeSpecialUrlSubpage('Book', '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('remove') ?>" /></a><a>
-+ <a onclick="return coll_remove_item(<?php echo $index ?>)" href="<?php echo htmlspecialchars(SkinTemplate::makeSpecialUrlSubpage('Book', '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('remove') ?>" /></a>
+@@ -221,7 +221,7 @@ if ( count( $this->data['collection']['i
+ foreach ( $this->data['collection']['items'] as $index => $item ) {
+ if ( $item['type'] == 'article' ) { ?>
+ <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><a>
++ <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>
- <?php if ($index == 0) { ?>
- <img src="<?php echo htmlspecialchars($mediapath . "trans.png") ?>" width="10" height="10" alt="" />
+ <?php if ( $index == 0 ) { ?>
+ <img src="<?php echo htmlspecialchars( $mediapath . "trans.png" ) ?>" width="10" height="10" alt="" />
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_createbox.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_createbox.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_createbox.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,26 +1,14 @@
$Id$
Fix CreateBox extension:
-* API impropriety
* XHTML/1.0 Transitional validity of output
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php 2011-04-12 14:24:28.000000000 +0200
-@@ -90,7 +90,7 @@
- return $value;
- }
-
--function acMakeBox($input, $argv, &$parser) {
-+function acMakeBox($input, $argv, $parser) {
- wfLoadExtensionMessages('CreateBox');
- global $wgRequest, $wgScript;
- if($wgRequest->getVal('action')=='create') {
-@@ -112,15 +112,13 @@
- $br = ((acGetOption($input, 'break', 'no')=='no') ? '' : '<br />');
- $label = acGetOption($input, 'buttonlabel', wfMsgHtml('createbox-create'));
- $output=<<<ENDFORM
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
+@@ -115,15 +115,13 @@ function acMakeBox( $input, $argv, $pars
+ $br = ( ( acGetOption( $input, 'break', 'no' ) == 'no' ) ? '' : '<br />' );
+ $label = acGetOption( $input, 'buttonlabel', wfMsgHtml( 'createbox-create' ) );
+ $output = <<<ENDFORM
-<div class="createbox" align="{$align}">
-<form name="createbox" action="{$submit}" method="get" class="createboxForm">
-<input type='hidden' name="action" value="create">
@@ -34,5 +22,5 @@
-</form></div>
+<input type='submit' name="create" class="createboxButton" value="{$label}"/></form></div>
ENDFORM;
- return $parser->replaceVariables($output);
+ return $parser->replaceVariables( $output );
}
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_fckeditor.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_fckeditor.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_fckeditor.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,10 +1,8 @@
Quick and dirty fix for #579822
-Index: trunk/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php 2011-04-12 14:24:28.000000000 +0200
-@@ -203,7 +203,7 @@
+--- a/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
++++ b/dist/mediawiki-extensions-fckeditor/usr/share/mediawiki-extensions/fckeditor/FCKeditor.body.php
+@@ -203,7 +203,7 @@ class FCKeditor_MediaWiki {
}
}
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_footnote.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_footnote.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_footnote.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -4,21 +4,19 @@
* API impropriety
* XHTML/1.0 Transitional validity of output
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php 2011-04-12 14:24:28.000000000 +0200
-@@ -56,8 +56,7 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
+@@ -63,8 +63,7 @@ function insert_endnotes( &$parser, &$te
$ret = "" ;
foreach( $footnoteNotes AS $num => $entry ) {
- $x = " <a name='footnote{$num}'></a>\n";
-- $x = $x . "<li>$entry <a href='#footnoteback{$num}'>↑</a></li>\n" ;
-+ $x = " <li id=\"footnote{$num}\">$entry <a href='#footnoteback{$num}'>↑</a></li>\n" ;
+- $x = $x . "<li>$entry <a href='#footnoteback{$num}'>↑</a></li>\n" ;
++ $x = " <li id=\"footnote{$num}\">$entry <a href='#footnoteback{$num}'>↑</a></li>\n" ;
$ret .= $x ;
}
$ret = "<hr /><ol>" . $ret . "</ol>" ;
-@@ -71,7 +70,7 @@
+@@ -78,7 +77,7 @@ function insert_endnotes( &$parser, &$te
return true;
}
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_graphviz.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_graphviz.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_graphviz.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -4,11 +4,9 @@
* path to dot
* XHTML/1.0 Transitional validity of output
-Index: trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php 2011-04-12 14:31:37.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php 2011-04-12 15:40:53.000000000 +0200
-@@ -20,7 +20,7 @@
+--- a/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
++++ b/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
+@@ -17,7 +17,7 @@
* Describes where your actual (dot) executable remains.
*
* Windows Default: C:/Programme/ATT/Graphviz/bin/
@@ -17,7 +15,7 @@
*
* $wgGraphVizSettings->mscgenPath
* Describes where your actual mscgen-executable remains
-@@ -449,9 +449,10 @@
+@@ -440,9 +440,10 @@ $wgExtensionCredits['parserhook'][] = ar
{
$txt = imageAtrributes( $args, $storagename, $map, $outputType, $wgUploadPath ); // if we want borders/position/...
} else {
@@ -31,7 +29,7 @@
}
-@@ -622,10 +623,10 @@
+@@ -613,10 +614,10 @@ $wgExtensionCredits['parserhook'][] = ar
}
// Produce the basic html
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_interwiki.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_interwiki.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_interwiki.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -3,11 +3,9 @@
Fix:
* Syntax error: UPDATE IGNORE tablename is not valid SQL
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php 2011-04-12 14:24:29.000000000 +0200
-@@ -188,9 +188,9 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
+@@ -188,9 +188,9 @@ class SpecialInterwiki extends SpecialPa
'iw_local' => $local, 'iw_trans' => $trans );
if( $do == 'add' ){
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_languageselector.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_languageselector.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -3,25 +3,23 @@
Fix LanguageSelector extension:
* XHTML/1.0 Transitional validity of output
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php 2011-04-12 14:24:28.000000000 +0200
-@@ -351,7 +351,7 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
+@@ -369,7 +369,7 @@ function wfLanguageSelectorHTML( Title $
$code = $wgLang->getCode();
$html = '';
-- $html .= Xml::openElement('span', array('id' => 'languageselector-box-'.$id, 'class' => 'languageselector ' . $class, 'style' => $style ));
-+ $html .= Xml::openElement('div', array('id' => 'languageselector-box-'.$id, 'class' => 'languageselector ' . $class, 'style' => $style ));
- $html .= Xml::openElement('form', array('name' => 'languageselector-form-'.$id, 'id' => 'languageselector-form-'.$id, 'method' => 'get', 'action' => $wgScript, 'style' => 'display:inline;'));
- $html .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() );
- $html .= Xml::openElement('select', array('name' => 'setlang', 'id' => 'languageselector-select-'.$id, 'style' => $selectorstyle));
-@@ -363,7 +363,7 @@
- $html .= Xml::closeElement('select');
- $html .= Xml::submitButton(wfMsg('languageselector-setlang'), array( 'id' => 'languageselector-commit-'.$id, 'style' => $buttonstyle ));
- $html .= Xml::closeElement('form');
-- $html .= Xml::closeElement('span');
-+ $html .= Xml::closeElement('div');
+- $html .= Xml::openElement( 'span', array(
++ $html .= Xml::openElement( 'div', array(
+ 'id' => 'languageselector-box-' . $id,
+ 'class' => 'languageselector ' . $class,
+ 'style' => $style
+@@ -399,7 +399,7 @@ function wfLanguageSelectorHTML( Title $
+ $html .= Xml::submitButton( wfMsg( 'languageselector-setlang' ),
+ array( 'id' => 'languageselector-commit-' . $id, 'style' => $buttonstyle ) );
+ $html .= Xml::closeElement( 'form' );
+- $html .= Xml::closeElement( 'span' );
++ $html .= Xml::closeElement( 'div' );
return $html;
}
Deleted: mediawiki-extensions/branches/experimental/debian/patches/fix_ldapauth.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_ldapauth.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_ldapauth.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,25 +0,0 @@
-$Id$
-
-Fix LDAP Auth extension:
-* Don’t overwrite connection pointer with nil (LP: #668589)
-* Pass the correct number of arguments to getSearchString
- (LP: #668589) (fixed upstream)
-
-Index: trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:29:21.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php 2011-04-12 14:30:00.000000000 +0200
-@@ -115,11 +115,11 @@
- return true;
- }
-
-- $this->ldapconn = $this->connect();
-+ $this->connect(); /* sets $this->ldapconn as a side effect */
- if ( $this->ldapconn ) {
- $this->printDebug( "Successfully connected", NONSENSITIVE );
-
-- $searchstring = $this->getSearchString( $this->ldapconn, $username );
-+ $searchstring = $this->getSearchString($username);
-
- //If we are using auto authentication, and we got
- //anything back, then the user exists.
Deleted: mediawiki-extensions/branches/experimental/debian/patches/fix_newestpages.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_newestpages.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_newestpages.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,19 +0,0 @@
-$Id$
-
-Fix this for PostgreSQL version 7.2(!) and up… *and* correct
-the order of arguments in this statement… this can never have
-worked in the first place I think.
-
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php 2011-04-12 14:24:29.000000000 +0200
-@@ -33,7 +33,7 @@
- $page = $dbr->tableName( 'page' );
- $nsf = $this->getNsFragment();
- $redir = $this->redirects ? '' : ' AND page_is_redirect = 0';
-- $res = $dbr->query( "SELECT page_namespace, page_title, page_is_redirect FROM $page WHERE {$nsf}{$redir} ORDER BY page_id DESC LIMIT 0,{$this->limit}" );
-+ $res = $dbr->query( "SELECT page_namespace, page_title, page_is_redirect FROM $page WHERE {$nsf}{$redir} ORDER BY page_id DESC LIMIT {$this->limit} OFFSET 0" );
- $count = $dbr->numRows( $res );
-
- # Don't show the navigation if we're including the page
Modified: mediawiki-extensions/branches/experimental/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/fix_rssreader.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/fix_rssreader.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -13,11 +13,9 @@
Also add documentation of these changes as README.Debian and point to
upstream's documentation in form of a wikipage.
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php 2011-04-12 14:24:29.000000000 +0200
-@@ -22,10 +22,11 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
+@@ -22,10 +22,11 @@ if ( !defined('MEDIAWIKI') ) {
}
$wgExtensionFunctions[] = 'efRSSReader';
@@ -30,7 +28,7 @@
'author' => 'Artem Kaznatcheev',
'description' => 'Adds <tt><rss></tt> tag',
'url' => 'http://www.mediawiki.org/wiki/Extension:RSS_Reader'
-@@ -37,7 +38,8 @@
+@@ -37,7 +38,8 @@ $egRSSReaderPath = $wgScriptPath."/exte
$egCacheTime = 3600; //default cache time in seconds
$egCacheTimeMin = 1800; //minimum cache time in seconds
$egCacheTimeMax = 7200; //maximum cache time in seconds
@@ -40,7 +38,7 @@
//boolean to determine if links created should have rel="nofollow"
$egNoFollow = false;
$egWidthMin = 200; //minimim width in pixels
-@@ -69,6 +71,7 @@
+@@ -69,6 +71,7 @@ function efRSSReader() {
function efCreateRSSReader($input, $argv, $parser){
global $wgOut, $egRSSReaderPath, $egCacheTime, $egCacheTimeMin,
@@ -48,7 +46,7 @@
$egCacheTimeMax, $egCache, $rssType, $egNoFollow, $egWidthMin,
$egWidthMax;
-@@ -152,17 +155,20 @@
+@@ -152,17 +155,20 @@ function efCreateRSSReader($input, $argv
if ($argv["title"]=="off") $dispTitle = false;
}
@@ -73,7 +71,7 @@
<tr>
';
}
-@@ -173,8 +179,8 @@
+@@ -173,8 +179,8 @@ function efCreateRSSReader($input, $argv
// Create cURLRSS or wikiRSS or lastRSS object
$rss = new $rssType; //initialize an object of rssType
// Set public variables
@@ -84,7 +82,7 @@
}
$rss->cache = $egCache; //cache attribute
$rss->cache_time = $cacheTime; //refresh time in seconds
-@@ -183,7 +189,7 @@
+@@ -183,7 +189,7 @@ function efCreateRSSReader($input, $argv
foreach ($fields as $field) {
//table cell that contains a single RSS feed
$output .= '<td valign="top" style="width: '.$width.'%;">';
@@ -93,11 +91,9 @@
if ($dispTitle) { //check if title should be displayed
$output .=
'<div class="RSSReader-head">'.
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php 2011-04-12 14:24:26.000000000 +0200
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php 2011-04-12 14:24:29.000000000 +0200
-@@ -149,14 +149,14 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
+@@ -149,14 +149,14 @@ class lastRSS {
{ $this->rsscp = $this->default_cp; } // This is used in my_preg_match()
// Parse CHANNEL info
@@ -114,7 +110,7 @@
// convert lastBuildDate to specified date format
$result['lastBuildDate'] = date($this->date_format, $timestamp);
}
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ class lastRSS {
if ($this->stripHTML && $result['items'][$i]['title'])
$result['items'][$i]['title'] = strip_tags($this->unhtmlentities(strip_tags($result['items'][$i]['title'])));
// If date_format is specified and pubDate is valid
@@ -123,10 +119,8 @@
// convert pubDate to specified date format
$result['items'][$i]['pubDate'] = date($this->date_format, $timestamp);
}
-Index: trunk/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian 2011-04-12 14:24:29.000000000 +0200
+--- /dev/null
++++ b/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian
@@ -0,0 +1,10 @@
+User-visible changes to the RSS_Reader extension:
+* set $egCache to false by default, since we have no www-data writable
Modified: mediawiki-extensions/branches/experimental/debian/patches/news_dont_break_feeds.patch
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/news_dont_break_feeds.patch 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/news_dont_break_feeds.patch 2012-06-29 15:38:56 UTC (rev 344)
@@ -5,11 +5,9 @@
is that the newly introduced (by this extension) <newsfeed> tag does
no longer work, but that’s no regression…
-Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php
-===================================================================
---- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php 2012-02-01 16:25:15.000000000 +0100
-+++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php 2012-02-01 16:26:13.000000000 +0100
-@@ -36,7 +36,11 @@
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php
+@@ -32,7 +32,11 @@ $wgNewsFeedUserPattern = false; // patte
$wgAutoloadClasses['NewsRenderer'] = dirname( __FILE__ ) . '/NewsRenderer.php';
$wgAutoloadClasses['NewsFeedPage'] = dirname( __FILE__ ) . '/NewsRenderer.php';
$wgHooks['ArticleFromTitle'][] = 'wfNewsArticleFromTitle';
@@ -19,6 +17,6 @@
+ * cf. https://evolvis.org/tracker/t_follow.php/2557
+ */
+//$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'wfNewsSkinTemplateOutputPageBeforeExec';
+ $wgHooks['ParserFirstCallInit'][] = 'wfNewsSetHooks';
//FIXME: find a way to override the feed URLs generated by OutputPage::getHeadLinks
-
Modified: mediawiki-extensions/branches/experimental/debian/patches/series
===================================================================
--- mediawiki-extensions/branches/experimental/debian/patches/series 2012-06-29 14:46:19 UTC (rev 343)
+++ mediawiki-extensions/branches/experimental/debian/patches/series 2012-06-29 15:38:56 UTC (rev 344)
@@ -1,12 +1,10 @@
fix_472283.patch
fix_collection.patch
-fix_createbox.patch
fix_fckeditor.patch
-fix_footnote.patch
fix_graphviz.patch
+fix_createbox.patch
+fix_footnote.patch
fix_languageselector.patch
-fix_newestpages.patch
fix_rssreader.patch
fix_interwiki.patch
-fix_ldapauth.patch
news_dont_break_feeds.patch
More information about the Pkg-mediawiki-commits
mailing list