[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Stop using deprecated Revision::getText()

2017-02-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325459 )

Change subject: Stop using deprecated Revision::getText()
..


Stop using deprecated Revision::getText()

Also don't serialize and reparse wikitext in 
FlaggedRevsUIHooks::overrideRedirect(),
instead use the Content object directly.

Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
---
M backend/FlaggedRevision.php
M frontend/FlaggedRevsUI.hooks.php
2 files changed, 3 insertions(+), 9 deletions(-)

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



diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 82feddd..69a3bbd 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -493,7 +493,7 @@
/**
 * Get text of the corresponding revision
 * Note: here for convenience
-* @return string|false revision timestamp in MW format
+* @return string|null Revision text, if available
 */
public function getRevText() {
return ContentHandler::getContentText( 
$this->mRevision->getContent() );
diff --git a/frontend/FlaggedRevsUI.hooks.php b/frontend/FlaggedRevsUI.hooks.php
index 00e6964..a717e16 100644
--- a/frontend/FlaggedRevsUI.hooks.php
+++ b/frontend/FlaggedRevsUI.hooks.php
@@ -203,14 +203,8 @@
if ( is_array( $tuple ) ) { // cache hit
list( $ignoreRedirect, $target ) = $tuple;
} else { // cache miss; fetch the stable rev text...
-   $text = $srev->getRevText();
-   $redirect = $fa->getRedirectURL(
-   ContentHandler::makeContent(
-   $text,
-   null,
-   CONTENT_MODEL_WIKITEXT
-   )->getUltimateRedirectTarget()
-   );
+   $content = $srev->getRevision()->getContent();
+   $redirect = $fa->getRedirectURL( 
$content->getUltimateRedirectTarget() );
if ( $redirect ) {
$target = $redirect; // use stable 
redirect
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Cenarium 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
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[master]: Stop using deprecated Revision::getText()

2016-12-05 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Stop using deprecated Revision::getText()
..

Stop using deprecated Revision::getText()

Also don't serialize and reparse wikitext in 
FlaggedRevsUIHooks::overrideRedirect(),
instead use the Content object directly.

Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
---
M backend/FlaggedRevision.php
M frontend/FlaggedRevsUI.hooks.php
2 files changed, 4 insertions(+), 10 deletions(-)


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

diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index c812eae..fa856f6 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -474,10 +474,10 @@
/**
 * Get text of the corresponding revision
 * Note: here for convenience
-* @return string|false revision timestamp in MW format
+* @return string Revision text
 */
public function getRevText() {
-   return $this->mRevision->getText();
+   return ContentHandler::getContentText( 
$this->mRevision->getContent() );
}
 
/**
diff --git a/frontend/FlaggedRevsUI.hooks.php b/frontend/FlaggedRevsUI.hooks.php
index 0abe3be..eb0e675 100644
--- a/frontend/FlaggedRevsUI.hooks.php
+++ b/frontend/FlaggedRevsUI.hooks.php
@@ -219,14 +219,8 @@
if ( is_array( $tuple ) ) { // cache hit
list( $ignoreRedirect, $target ) = $tuple;
} else { // cache miss; fetch the stable rev text...
-   $text = $srev->getRevText();
-   $redirect = $fa->getRedirectURL(
-   ContentHandler::makeContent(
-   $text,
-   null,
-   CONTENT_MODEL_WIKITEXT
-   )->getUltimateRedirectTarget()
-   );
+   $content = $srev->getRevision()->getContent();
+   $redirect = $fa->getRedirectURL( 
$content->getUltimateRedirectTarget() );
if ( $redirect ) {
$target = $redirect; // use stable 
redirect
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I730a3370d9e1f364371f0b896f6f9fbdb6dd9bcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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