From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 26 Jul 2011 16:17:19 +0000 (+0000)
Subject: * (bug 29685) do not output NULL parentid with list=deletedrevs&drprop=parentid
X-Git-Tag: 1.31.0-rc.0~28614
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=fe046405741a20f72d617cc831e99de91a46c8ad;p=lhc%2Fweb%2Fwiklou.git

* (bug 29685) do not output NULL parentid with list=deletedrevs&drprop=parentid
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 8241ecbc65..b018f420e9 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -30,6 +30,8 @@ production.
 * (bug 19838) siprop=interwikimap can now use the interwiki cache.
 * (bug 29748) Add API search prefix support
 * (bug 29684) Set forgotten parameter types in ApiQueryIWLinks
+* (bug 29685) do not output NULL parentid with
+  list=deletedrevs&drprop=parentid
 
 === Languages updated in 1.19 ===
 
diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 3e67dee0c9..d8108022a5 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -214,7 +214,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			if ( $fld_revid ) {
 				$rev['revid'] = intval( $row->ar_rev_id );
 			}
-			if ( $fld_parentid ) {
+			if ( $fld_parentid && !is_null( $row->ar_parent_id ) ) {
 				$rev['parentid'] = intval( $row->ar_parent_id );
 			}
 			if ( $fld_user ) {