Alexander.lehmann has submitted this change and it was merged.

Change subject: Used a different hook to prevent Link headers from being 
generated twice. Rewrote test for Link header insertion.
......................................................................


Used a different hook to prevent Link headers from being generated
twice. Rewrote test for Link header insertion.

Change-Id: I554dd4873bcc15268aa72f6f99fda76737f65850
---
M PubSubHubbub.body.php
M PubSubHubbub.php
M tests/phpunit/PubSubHubbubTest.php
3 files changed, 20 insertions(+), 7 deletions(-)

Approvals:
  WikidataJenkins: Verified
  Alexander.lehmann: Looks good to me, approved



diff --git a/PubSubHubbub.body.php b/PubSubHubbub.body.php
index 39161f5..f744b11 100644
--- a/PubSubHubbub.body.php
+++ b/PubSubHubbub.body.php
@@ -57,7 +57,7 @@
                ) );
        }
 
-       private static function insertLinkHeader( $page ) {
+       public static function insertLinkHeader( $page ) {
                global $wgRequest, $wgPubSubHubbubHubURL;
                if ( !self::isConfigurationSetUp() ) {
                        return;
@@ -83,8 +83,10 @@
                self::insertLinkHeader( $rawPage );
        }
 
-       public static function onArticlePageDataAfter( $wikiPage, $row ) {
-               self::insertLinkHeader( $wikiPage );
+       public static function onOutputPageBeforeHTML( \OutputPage &$out, 
&$text ) {
+               if ( $out->canUseWikiPage() ) {
+                       self::insertLinkHeader( $out->getWikiPage() );
+               }
        }
 
        public static function onUnitTestsList( &$files ) {
diff --git a/PubSubHubbub.php b/PubSubHubbub.php
index b313225..28f3146 100644
--- a/PubSubHubbub.php
+++ b/PubSubHubbub.php
@@ -52,6 +52,6 @@
 
 $wgHooks['PageContentSaveComplete'][] = 
'PubSubHubbub\\PubSubHubbub::onPageContentSaveComplete';
 $wgHooks['RawPageViewBeforeOutput'][] = 
'PubSubHubbub\\PubSubHubbub::onRawPageViewBeforeOutput';
-$wgHooks['ArticlePageDataAfter'][] = 
'PubSubHubbub\\PubSubHubbub::onArticlePageDataAfter';
+$wgHooks['OutputPageBeforeHTML'][] = 
'PubSubHubbub\\PubSubHubbub::onOutputPageBeforeHTML';
 $wgHooks['UnitTestsList'][] = 'PubSubHubbub\\PubSubHubbub::onUnitTestsList';
 $wgJobClasses['PublishChanges'] = 'PubSubHubbub\\PublishChangesJob';
diff --git a/tests/phpunit/PubSubHubbubTest.php 
b/tests/phpunit/PubSubHubbubTest.php
index fd49384..e0a73e1 100644
--- a/tests/phpunit/PubSubHubbubTest.php
+++ b/tests/phpunit/PubSubHubbubTest.php
@@ -81,9 +81,6 @@
 
        /**
         * @dataProvider WBLinkHeaderData
-        *
-        * @param string $titleText
-        * @param string $urlText
         */
        public  function  testCreateWBLinkHeader( $titleText, $urlText) {
                if ( defined( 'WB_VERSION' ) ) {
@@ -101,6 +98,19 @@
                else {
                        $this->markTestSkipped('The Wikibase-extension is not 
available.');
                }
+       }
+
+       public function testInsertLinkHeader() {
+               $title = \Title::newFromText( "TestTitle" );
+               $article = new \Article( $title );
+
+               PubSubHubbub::insertLinkHeader( $article );
+
+               global $wgRequest, $wgPubSubHubbubHubURL;
+               $sExpectedLinkHeader = PubSubHubbub::createLinkHeader( 
$wgPubSubHubbubHubURL, $article );
+               $sActualLinkHeader = "Link: " . 
$wgRequest->response()->getHeader( "Link" );
+
+               $this->assertEquals( $sExpectedLinkHeader, $sActualLinkHeader );
        }
 
        public function contentSaveData() {
@@ -148,4 +158,5 @@
                        array( 'https://www.example.com' )
                );
        }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I554dd4873bcc15268aa72f6f99fda76737f65850
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/PubSubHubbub
Gerrit-Branch: master
Gerrit-Owner: Nik <[email protected]>
Gerrit-Reviewer: Alexander.lehmann 
<[email protected]>
Gerrit-Reviewer: Nik <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>

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

Reply via email to