[Pkg-mediawiki-commits] r420 - in mediawiki-extensions/branches/squeeze/debian: . patches

[Jonathan Wiltshire]

Author: jmw
Date: 2012-12-29 22:44:23 +0000 (Sat, 29 Dec 2012)
New Revision: 420

Added:
   mediawiki-extensions/branches/squeeze/debian/patches/php53_confirmedit.patch
Modified:
   mediawiki-extensions/branches/squeeze/debian/changelog
   mediawiki-extensions/branches/squeeze/debian/patches/series
Log:
Import NMU version 2.3squeeze1

Modified: mediawiki-extensions/branches/squeeze/debian/changelog
===================================================================
--- mediawiki-extensions/branches/squeeze/debian/changelog	2012-12-29 22:39:54 UTC (rev 419)
+++ mediawiki-extensions/branches/squeeze/debian/changelog	2012-12-29 22:44:23 UTC (rev 420)
@@ -1,3 +1,11 @@
+mediawiki-extensions (2.3squeeze1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * php53_confirmedit.patch: PHP5.3 compatibility fixes for ConfirmEdit.
+    (Closes: #612227)
+
+ -- Stefano Rivera <stefanor at debian.org>  Tue, 08 Mar 2011 22:44:27 +0200
+
 mediawiki-extensions (2.3) unstable; urgency=low
 
   * debian/control: add Vcs-SVN and Vcs-Browser

Added: mediawiki-extensions/branches/squeeze/debian/patches/php53_confirmedit.patch
===================================================================
--- mediawiki-extensions/branches/squeeze/debian/patches/php53_confirmedit.patch	                        (rev 0)
+++ mediawiki-extensions/branches/squeeze/debian/patches/php53_confirmedit.patch	2012-12-29 22:44:23 UTC (rev 420)
@@ -0,0 +1,61 @@
+Description: PHP 5.3 compatibility fixes for ConfirmEdit.
+Origin:
+ http://www.mediawiki.org/wiki/Special:Code/MediaWiki/53461
+ http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55449
+Bug-Debian: http://bugs.debian.org/612267
+Bug-Wikimedia: https://bugzilla.wikimedia.org/show_bug.cgi?id=20383
+Last-Update: 2011-02-14
+--- a/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php
++++ b/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php
+@@ -15,15 +15,15 @@
+ 		return $wgCaptcha;
+ 	}
+ 
+-	static function confirmEdit( &$editPage, $newtext, $section ) {
++	static function confirmEdit( $editPage, $newtext, $section ) {
+ 		return self::getInstance()->confirmEdit( $editPage, $newtext, $section );
+ 	}
+ 
+-	static function confirmEditMerged( &$editPage, $newtext ) {
++	static function confirmEditMerged( $editPage, $newtext ) {
+ 		return self::getInstance()->confirmEditMerged( $editPage, $newtext );
+ 	}
+ 	
+-	static function confirmEditAPI( &$editPage, $newtext, &$resultArr ) {
++	static function confirmEditAPI( $editPage, $newtext, &$resultArr ) {
+ 		return self::getInstance()->confirmEditAPI( $editPage, $newtext, $resultArr );
+ 	}
+ 
+@@ -458,7 +458,7 @@
+ 	 * Backend function for confirmEdit() and confirmEditAPI()
+ 	 * @return bool false if the CAPTCHA is rejected, true otherwise
+ 	 */
+-	private function doConfirmEdit( &$editPage, $newtext, $section, $merged = false ) {
++	private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
+ 		if( $this->shouldCheck( $editPage, $newtext, $section, $merged ) ) {
+ 			if( $this->passCaptcha() ) {
+ 				return true;
+@@ -479,7 +479,7 @@
+ 	 * @param bool $merged
+ 	 * @return bool true to continue saving, false to abort and show a captcha form
+ 	 */
+-	function confirmEdit( &$editPage, $newtext, $section, $merged = false ) {
++	function confirmEdit( $editPage, $newtext, $section, $merged = false ) {
+ 		if( defined('MW_API') ) {
+ 			# API mode
+ 			# The CAPTCHA was already checked and approved 
+@@ -497,12 +497,12 @@
+ 	 * @param EditPage $editPage
+ 	 * @param string $newtext
+ 	 */
+-	function confirmEditMerged( &$editPage, $newtext ) {
++	function confirmEditMerged( $editPage, $newtext ) {
+ 		return $this->confirmEdit( $editPage, $newtext, false, true );
+ 	}
+ 	
+ 	
+-	function confirmEditAPI( &$editPage, $newtext, &$resultArr) {
++	function confirmEditAPI( $editPage, $newtext, &$resultArr) {
+ 		if( !$this->doConfirmEdit( $editPage, $newtext, false, false ) ) {
+ 			$this->addCaptchaAPI($resultArr);
+ 			return false;

Modified: mediawiki-extensions/branches/squeeze/debian/patches/series
===================================================================
--- mediawiki-extensions/branches/squeeze/debian/patches/series	2012-12-29 22:39:54 UTC (rev 419)
+++ mediawiki-extensions/branches/squeeze/debian/patches/series	2012-12-29 22:44:23 UTC (rev 420)
@@ -6,3 +6,4 @@
 fix_languageselector.patch
 fix_newestpages.patch
 fix_rssreader.patch
+php53_confirmedit.patch