Yaron Koren has submitted this change and it was merged.

Change subject: Apparently MW 1.17 is no longer supported by this code - 
removed support further
......................................................................


Apparently MW 1.17 is no longer supported by this code - removed support further

Change-Id: I53d6a7956346a7f3360869bd17b84a59080f468b
---
M ApprovedRevs.hooks.php
M README
M SpecialApprovedRevs.php
3 files changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Yaron Koren: Verified; Looks good to me, approved



diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index 2e52cd0..fabbffd 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -181,12 +181,9 @@
                        if ( method_exists( $article, 'getRevisionFetched' ) ) {
                                // MW 1.19+
                                $article->getRevisionFetched();
-                       } elseif ( method_exists( $article, 'fetchContent' ) ) {
+                       } else {
                                // MW 1.18
                                $article->fetchContent();
-                       } else {
-                               // MW 1.17
-                               $article->loadContent();
                        }
                }
                return true;
diff --git a/README b/README
index ecd6f1a..1fd54ee 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@
 
 == Requirements ==
 
-This version of the Approved Revs extension requires MediaWiki 1.17 or
+This version of the Approved Revs extension requires MediaWiki 1.18 or
 higher.
 
 == Installation ==
diff --git a/SpecialApprovedRevs.php b/SpecialApprovedRevs.php
index 40e2ebc..0ae1765 100644
--- a/SpecialApprovedRevs.php
+++ b/SpecialApprovedRevs.php
@@ -216,8 +216,7 @@
        function formatResult( $skin, $result ) {
                $title = Title::newFromId( $result->id );
                
-               // link introduced in 1.16, where makeLinkObj got deprecated
-               $pageLink = is_callable( array( $skin, 'link' ) ) ? 
$skin->link( $title ) : $skin->makeLinkObj( $title );
+               $pageLink = $skin->link( $title );
                
                if ( $this->mMode == 'unapproved' ) {
                        global $egApprovedRevsShowApproveLatest;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53d6a7956346a7f3360869bd17b84a59080f468b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to