[MediaWiki-commits] [Gerrit] Allows to keep user as null throw API edit - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100793


Change subject: Allows to keep user as null throw API edit
......................................................................

Allows to keep user as null throw API edit

Change-Id: I77385c4ee3115ad83fc4d1d6753049cf30fcdf8b
---
M ProofreadPage.body.php
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/93/100793/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index cd43f36..a59b511 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -697,13 +697,15 @@
                $oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
                $newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
-               if ( !$newContent->isValid() || 
$newContent->getLevel()->getUser() === null ) {
-                       $resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
-                       return false;
-               }
-
                if ( $oldContent === null ) {
                        $oldContent = $contentHandler->makeEmptyContent();
+               }
+               $oldLevel = $oldContent->getLevel();
+               $newLevel = $newContent->getLevel();
+
+               if ( !$newContent->isValid() || $newLevel->getUser() === null 
&& $oldLevel->getUser() !== null ) {
+                       $resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
+                       return false;
                }
 
                $oldLevel = $oldContent->getLevel();
@@ -711,7 +713,7 @@
                //if the user change the level, the change should be allowed 
and the new User should be the editing user
                if (
                        !$newLevel->equals( $oldLevel ) &&
-                       ( $newLevel->getUser()->getName() !== $user->getName() 
|| !$oldLevel->isChangeAllowed( $newLevel ) )
+                       ( $newLevel->getUser() === null || 
$newLevel->getUser()->getName() !== $user->getName() || 
!$oldLevel->isChangeAllowed( $newLevel ) )
                ) {
                        $resultArr['notallowed'] = wfMessage( 
'proofreadpage_notallowedtext' )->text();
                        return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/100793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77385c4ee3115ad83fc4d1d6753049cf30fcdf8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits