FU r106514: Sanity check for empty sha1 values in the DB

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 0422eba..3be0a7a 100644 (file)
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -236,7 +236,11 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                                $rev['len'] = $row->ar_len;
                        }
                        if ( $fld_sha1 ) {
-                               $rev['sha1'] = wfBaseConvert( $row->ar_sha1, 36, 16, 40 );
+                               if ( $row->ar_sha1 != '' ) {
+                                       $rev['sha1'] = wfBaseConvert( $row->ar_sha1, 36, 16, 40 );
+                               } else {
+                                       $rev['sha1'] = '';
+                               }
                        }
                        if ( $fld_content ) {
                                ApiResult::setContent( $rev, Revision::getRevisionText( $row ) );

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 8da079c..f8003a3 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -414,7 +414,11 @@ class ApiQueryRevisions extends ApiQueryBase {
                }
 
                if ( $this->fld_sha1 ) {
-                       $vals['sha1'] = wfBaseConvert( $revision->getSha1(), 36, 16, 40 );
+                       if ( $revision->getSha1() != '' ) {
+                               $vals['sha1'] = wfBaseConvert( $revision->getSha1(), 36, 16, 40 );
+                       } else {
+                               $vals['sha1'] = '';
+                       }
                }
 
                if ( $this->fld_comment || $this->fld_parsedcomment ) {