[MediaWiki-commits] [Gerrit] mediawiki...Quantcast[master]: Use protocol-relative URLs to avoid mixed content warnings w...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400208 )
Change subject: Use protocol-relative URLs to avoid mixed content warnings when
using HTTPS
..
Use protocol-relative URLs to avoid mixed content warnings when using HTTPS
Bug: T183677
Change-Id: I5b0cf58e079d46dafe69e87c632d0e6f5402f60a
---
M QuantcastTracking.class.php
M extension.json
2 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
SamanthaNguyen: Looks good to me, but someone else must approve
jenkins-bot: Verified
Isarra: Looks good to me, but someone else must approve
diff --git a/QuantcastTracking.class.php b/QuantcastTracking.class.php
index a12a16b..f159df5 100644
--- a/QuantcastTracking.class.php
+++ b/QuantcastTracking.class.php
@@ -25,7 +25,7 @@
$groups = $skin->getUser()->getEffectiveGroups();
if ( !in_array( $wgQuantcastTrackingExcludedGroups, $groups ) )
{
- $message = $skin->msg( 'quantcast-tracking-number'
)->inContentLanguage();
+ $message = $skin->msg( 'quantcast-tracking-number'
)->inContentLanguage();
// We have a custom tracking code, use it!
if ( !$message->isDisabled() ) {
$trackingCode = trim( $message->text() );
@@ -39,9 +39,9 @@
qacct: "' . $safeCode . '"
};
/*]]>*/
- http://edge.quantserve.com/quant.js";>
+
- http://pixel.quantserve.com/pixel/' . $safeCode .
'.gif" style="display: none;" border="0" height="1" width="1" alt="Quantcast" />
+
' . "\n\n";
}
diff --git a/extension.json b/extension.json
index 2bc2bb4..fce32d5 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Quantcast Tracking",
- "version": "0.4.0",
+ "version": "0.4.1",
"author": [
"Jack Phoenix"
],
@@ -19,9 +19,7 @@
"QuantcastTracking": "QuantcastTracking.class.php"
},
"Hooks": {
- "SkinAfterBottomScripts": [
- "QuantcastTracking::onSkinAfterBottomScripts"
- ]
+ "SkinAfterBottomScripts":
"QuantcastTracking::onSkinAfterBottomScripts"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/400208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b0cf58e079d46dafe69e87c632d0e6f5402f60a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quantcast
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: SamanthaNguyen
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...Quantcast[master]: Use protocol-relative URLs to avoid mixed content warnings w...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400208 )
Change subject: Use protocol-relative URLs to avoid mixed content warnings when
using HTTPS
..
Use protocol-relative URLs to avoid mixed content warnings when using HTTPS
Bug: T183677
Change-Id: I5b0cf58e079d46dafe69e87c632d0e6f5402f60a
---
M QuantcastTracking.class.php
M extension.json
2 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quantcast
refs/changes/08/400208/1
diff --git a/QuantcastTracking.class.php b/QuantcastTracking.class.php
index a12a16b..f159df5 100644
--- a/QuantcastTracking.class.php
+++ b/QuantcastTracking.class.php
@@ -25,7 +25,7 @@
$groups = $skin->getUser()->getEffectiveGroups();
if ( !in_array( $wgQuantcastTrackingExcludedGroups, $groups ) )
{
- $message = $skin->msg( 'quantcast-tracking-number'
)->inContentLanguage();
+ $message = $skin->msg( 'quantcast-tracking-number'
)->inContentLanguage();
// We have a custom tracking code, use it!
if ( !$message->isDisabled() ) {
$trackingCode = trim( $message->text() );
@@ -39,9 +39,9 @@
qacct: "' . $safeCode . '"
};
/*]]>*/
- http://edge.quantserve.com/quant.js";>
+
- http://pixel.quantserve.com/pixel/' . $safeCode .
'.gif" style="display: none;" border="0" height="1" width="1" alt="Quantcast" />
+
' . "\n\n";
}
diff --git a/extension.json b/extension.json
index 2bc2bb4..fce32d5 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Quantcast Tracking",
- "version": "0.4.0",
+ "version": "0.4.1",
"author": [
"Jack Phoenix"
],
@@ -19,9 +19,7 @@
"QuantcastTracking": "QuantcastTracking.class.php"
},
"Hooks": {
- "SkinAfterBottomScripts": [
- "QuantcastTracking::onSkinAfterBottomScripts"
- ]
+ "SkinAfterBottomScripts":
"QuantcastTracking::onSkinAfterBottomScripts"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/400208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b0cf58e079d46dafe69e87c632d0e6f5402f60a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quantcast
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
