jenkins-bot has submitted this change and it was merged.
Change subject: Fixup whitespace
......................................................................
Fixup whitespace
Point thumb_hanalder.php directly to thumb.php
Change-Id: I11b970f98732d969acc3ee200feadea05e5463d1
---
M w/favicon.php
M w/mobileRedirect.php
M w/query.php
M w/thumb_handler.php
4 files changed, 7 insertions(+), 11 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/w/favicon.php b/w/favicon.php
index 82ca0c7..eeca3cd 100644
--- a/w/favicon.php
+++ b/w/favicon.php
@@ -15,7 +15,7 @@
if ( $wgFavicon === '/favicon.ico' ) {
# That's not very helpful, that's where we are already
header( 'HTTP/1.1 404 Not Found' );
- faviconShowError( "\$wgFavicon is configured incorrectly, " .
+ faviconShowError( "\$wgFavicon is configured incorrectly, " .
"it must be set to something other than /favicon.ico\n"
);
return;
}
@@ -30,12 +30,11 @@
$url = wfExpandUrl( $wgFavicon, PROTO_INTERNAL );
$client = MWHttpRequest::factory( $url );
$client->setHeader( 'X-Favicon-Loop', '1' );
-
+
$status = $client->execute();
if ( !$status->isOK() ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( htmlspecialchars(
- "Failed to fetch URL \"$url\"" ) );
+ faviconShowError( htmlspecialchars( "Failed to fetch URL
\"$url\"" ) );
return;
}
diff --git a/w/mobileRedirect.php b/w/mobileRedirect.php
index a5693c8..833b7cb 100644
--- a/w/mobileRedirect.php
+++ b/w/mobileRedirect.php
@@ -2,9 +2,9 @@
// Used to set a 3-year-long cookie to stop mobile redirects from happening
// Created by Hampton Catlin
if($_GET['expires_in_days']) {
- $date_of_expiry = time() + (intval($_GET['expires_in_days']) * 60 * 60 * 24);
+ $date_of_expiry = time() + ( intval( $_GET['expires_in_days'] ) * 60 *
60 * 24 );
} else {
- $date_of_expiry = 0;
+ $date_of_expiry = 0;
}
setcookie( "stopMobileRedirect", "true", $date_of_expiry, "/");
diff --git a/w/query.php b/w/query.php
index 723c3e8..6ef378d 100644
--- a/w/query.php
+++ b/w/query.php
@@ -18,10 +18,7 @@
mailing list.</p>
<?php
-
-echo "<!-- filler for IE " .
- str_repeat( "*", 1024 ) .
- " -->";
+echo "<!-- filler for IE " . str_repeat( "*", 1024 ) . " -->";
?>
</body>
</html>
diff --git a/w/thumb_handler.php b/w/thumb_handler.php
index d6acf6f..cbcc73e 100644
--- a/w/thumb_handler.php
+++ b/w/thumb_handler.php
@@ -1,3 +1,3 @@
<?php
require_once( './MWVersion.php' );
-require getMediaWiki( 'thumb_handler.php' );
+require getMediaWiki( 'thumb.php' );
--
To view, visit https://gerrit.wikimedia.org/r/85393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11b970f98732d969acc3ee200feadea05e5463d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
