jenkins-bot has submitted this change and it was merged.
Change subject: Fix a couple warnings in beta
......................................................................
Fix a couple warnings in beta
* Notice: Undefined index: wpSave in
/srv/common-local/wmf-config/CommonSettings.php on line 950
* Warning: Creating default object from empty value in
/srv/common-local/wmf-config/filebackend-labs.php on line 13
Change-Id: I00bfea1530ef01009474161a7e1da5053278f149
---
M wmf-config/CommonSettings.php
M wmf-config/filebackend-labs.php
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ac941d8..3c118b8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -947,7 +947,8 @@
gmdate( 'r' ) . "\t" .
"$uri\t" .
"{$_SERVER['HTTP_X_FORWARDED_FOR']},
{$_SERVER['REMOTE_ADDR']}\t" .
- ( $_REQUEST['wpSave'] ? 'save' : '' ) . "\n",
+ ( ( isset( $_REQUEST['wpSave'] ) && $_REQUEST['wpSave']
) ? 'save' : '' )
+ . "\n",
"udp://$wmfUdp2logDest/xff"
);
if ( $wgRequest->getIP() === '127.0.0.1' ) {
diff --git a/wmf-config/filebackend-labs.php b/wmf-config/filebackend-labs.php
index 614b1ac..9d08274 100644
--- a/wmf-config/filebackend-labs.php
+++ b/wmf-config/filebackend-labs.php
@@ -10,8 +10,9 @@
# Whenever the timeline extension is provided an empty string as a file
# backend, it will gracefully fallback to a FSFileBackend pointing to
# "{$wgUploadDirectory}/timeline"
-$wgTimelineSettings->fileBackend = '';
-
+if ( isset( $wgTimelineSettings ) ) {
+ $wgTimelineSettings->fileBackend = '';
+}
// labs does not have swift yet as of 20120525 -- hashar
--
To view, visit https://gerrit.wikimedia.org/r/148552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00bfea1530ef01009474161a7e1da5053278f149
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
