Bartosz Dziewoński has submitted this change and it was merged.
Change subject: Remove $wgArticle dependency
......................................................................
Remove $wgArticle dependency
Change-Id: I48326ccc2a85fd11765d0023e97b42167bb4d3c1
---
M TwitterCards.php
1 file changed, 2 insertions(+), 9 deletions(-)
Approvals:
Bartosz Dziewoński: Verified; Looks good to me, approved
diff --git a/TwitterCards.php b/TwitterCards.php
index 11abe3a..20c52bf 100644
--- a/TwitterCards.php
+++ b/TwitterCards.php
@@ -39,7 +39,7 @@
* @return Boolean always true, to go on with BeforePageDisplay processing
*/
function efTwitterCardsHook( &$out, &$sk ) {
- global $wgLogo, $wgSitename, $wgArticle, $wgUploadPath, $wgServer,
$wgArticleId;
+ global $wgLogo, $wgSitename, $wgUploadPath, $wgServer, $wgArticleId;
$title = $out->getTitle();
$isMainpage = $title->isMainPage();
@@ -48,15 +48,8 @@
$meta["twitter:card"] = "photo"; // current proof of concept is
tailored to work with images
$meta["twitter:site"] = $wgSitename;
- // Processes only articles
- if ( isset( $wgArticle ) ) {
- $myArticle = $wgArticle;
- } else {
- return true;
- }
-
$dbr = wfGetDB( DB_SLAVE );
- $pageId = $myArticle->getId();
+ $pageId = $out->getWikiPage()->getId();
$res = $dbr->select(
'revision',
'rev_user_text',
--
To view, visit https://gerrit.wikimedia.org/r/96113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48326ccc2a85fd11765d0023e97b42167bb4d3c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwitterCards
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
