MarkAHershberger has submitted this change and it was merged.
Change subject: Prevent PHP notice by adding isset() check
......................................................................
Prevent PHP notice by adding isset() check
Issue was caused by change
I34c3fc9d8f9467e83cd201cb099c2d26f3a39b36
Bug: 46627
Change-Id: Ida87efc622e9e90b835473f069559817565eafc1
---
M includes/WebRequest.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
MarkAHershberger: Looks good to me, approved
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 30a51b0..739340c 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -654,10 +654,12 @@
if( $hash !== false ) {
$base = substr( $base, 0, $hash );
}
+
if( $base[0] == '/' ) {
- if( $base[1] == '/' ) { /* More than one slash will
look like it is protocol relative */
+ if( isset( $base[1] ) && $base[1] == '/' ) { /* More
than one slash will look like it is protocol relative */
return preg_replace( '!//*!', '/', $base );
}
+
return $base;
} else {
// We may get paths with a host prepended; strip it.
--
To view, visit https://gerrit.wikimedia.org/r/56372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida87efc622e9e90b835473f069559817565eafc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
