--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
Hi, I NMUed a PHP5.3 compatibility fix for RC bug #612227. 2.3+nmu1 has
since made its way into testing, without any reported issues.
Please consider this identical update for squeeze.
SR
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'testing-proposed-updates'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru mediawiki-extensions-2.3/debian/changelog mediawiki-extensions-2.3squeeze1/debian/changelog
--- mediawiki-extensions-2.3/debian/changelog 2010-07-03 15:06:10.000000000 +0200
+++ mediawiki-extensions-2.3squeeze1/debian/changelog 2011-03-07 14:13:32.000000000 +0200
@@ -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@debian.org> Mon, 07 Mar 2011 14:04:51 +0200
+
mediawiki-extensions (2.3) unstable; urgency=low
* debian/control: add Vcs-SVN and Vcs-Browser
diff -Nru mediawiki-extensions-2.3/debian/patches/php53_confirmedit.patch mediawiki-extensions-2.3squeeze1/debian/patches/php53_confirmedit.patch
--- mediawiki-extensions-2.3/debian/patches/php53_confirmedit.patch 1970-01-01 02:00:00.000000000 +0200
+++ mediawiki-extensions-2.3squeeze1/debian/patches/php53_confirmedit.patch 2011-02-14 09:32:41.000000000 +0200
@@ -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;
diff -Nru mediawiki-extensions-2.3/debian/patches/series mediawiki-extensions-2.3squeeze1/debian/patches/series
--- mediawiki-extensions-2.3/debian/patches/series 2010-06-30 17:02:21.000000000 +0200
+++ mediawiki-extensions-2.3squeeze1/debian/patches/series 2011-02-14 09:29:51.000000000 +0200
@@ -6,3 +6,4 @@
fix_languageselector.patch
fix_newestpages.patch
fix_rssreader.patch
+php53_confirmedit.patch
--- End Message ---