jenkins-bot has submitted this change and it was merged.
Change subject: Fix cannot access private property OutputPage::$mHTMLtitle
......................................................................
Fix cannot access private property OutputPage::$mHTMLtitle
It doesn't seem to be used anyway, so I did not even bother to use
getHTMLTitle(). This issue doesn't exist in master.
Change-Id: I4a09c4e0ac52dee2688ae863fa3bc889eba4efc1
---
M Add_HTML_Meta_and_Title.php
1 file changed, 7 insertions(+), 10 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Add_HTML_Meta_and_Title.php b/Add_HTML_Meta_and_Title.php
index 9e1c9bc..2faa9ba 100644
--- a/Add_HTML_Meta_and_Title.php
+++ b/Add_HTML_Meta_and_Title.php
@@ -106,16 +106,13 @@
# Merge keyword data into OutputPage as meta tags
foreach ($data as $item) {
$content = @base64_decode($item);
- $content = htmlspecialchars($content, ENT_QUOTES);
- if ($content){
- $new_title = $out->mHTMLtitle;
-
- //Set page title
- global $wgSitename;
- $new_title = "$content - $wgSitename";
- $out->mHTMLtitleFromPagetitle = true;
- $out->setHTMLTitle( $new_title );
- }
+ $content = htmlspecialchars($content, ENT_QUOTES);
+ if ($content) {
+ // Set page title
+ global $wgSitename;
+ $new_title = "$content - $wgSitename";
+ $out->setHTMLTitle( $new_title );
+ }
}
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/268693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a09c4e0ac52dee2688ae863fa3bc889eba4efc1
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/AddHTMLMetaAndTitle
Gerrit-Branch: REL1_26
Gerrit-Owner: Southparkfan <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Southparkfan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
