[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[wmf/1.28.0-wmf.20]: Fix I9839283c: new_text is actually a Content object

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix I9839283c: new_text is actually a Content object
..


Fix I9839283c: new_text is actually a Content object

Bug: T146423
Change-Id: I518eb5528d0354207deb418a4afaf49ce2607f32
---
M business/RevisionReviewForm.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/business/RevisionReviewForm.php b/business/RevisionReviewForm.php
index 69e7a49..55d01bf 100644
--- a/business/RevisionReviewForm.php
+++ b/business/RevisionReviewForm.php
@@ -324,15 +324,15 @@
}
$article = new WikiPage( $this->page );
# Get text with changes after $oldRev up to and 
including $newRev removed
-   $new_text = $article->getUndoContent( $newRev, $oldRev 
);
-   if ( $new_text === false ) {
+   $new_content = $article->getUndoContent( $newRev, 
$oldRev );
+   if ( $new_content === false ) {
return 'review_cannot_undo';
}
$baseRevId = $newRev->isCurrent() ? $oldRev->getId() : 
0;
 
# Actually make the edit...
$editStatus = $article->doEditContent(
-   ContentHandler::makeContent( $new_text, 
$article->getTitle() ),
+   $new_content,
$this->getComment(),
0,
$baseRevId,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I518eb5528d0354207deb418a4afaf49ce2607f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[wmf/1.28.0-wmf.20]: Fix I9839283c: new_text is actually a Content object

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Fix I9839283c: new_text is actually a Content object
..

Fix I9839283c: new_text is actually a Content object

Bug: T146423
Change-Id: I518eb5528d0354207deb418a4afaf49ce2607f32
---
M business/RevisionReviewForm.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/23/312423/1

diff --git a/business/RevisionReviewForm.php b/business/RevisionReviewForm.php
index 69e7a49..55d01bf 100644
--- a/business/RevisionReviewForm.php
+++ b/business/RevisionReviewForm.php
@@ -324,15 +324,15 @@
}
$article = new WikiPage( $this->page );
# Get text with changes after $oldRev up to and 
including $newRev removed
-   $new_text = $article->getUndoContent( $newRev, $oldRev 
);
-   if ( $new_text === false ) {
+   $new_content = $article->getUndoContent( $newRev, 
$oldRev );
+   if ( $new_content === false ) {
return 'review_cannot_undo';
}
$baseRevId = $newRev->isCurrent() ? $oldRev->getId() : 
0;
 
# Actually make the edit...
$editStatus = $article->doEditContent(
-   ContentHandler::makeContent( $new_text, 
$article->getTitle() ),
+   $new_content,
$this->getComment(),
0,
$baseRevId,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I518eb5528d0354207deb418a4afaf49ce2607f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Alex Monk 

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