jenkins-bot has submitted this change and it was merged.
Change subject: Don't die when log message is missing user
......................................................................
Don't die when log message is missing user
Log -1 in place of user id when user is not set
Change-Id: Ic7f4e22292601c14fa79e9aa9c70d687f807728a
---
M sites/all/modules/wmf_logging/wmf_logging.module
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_logging/wmf_logging.module
b/sites/all/modules/wmf_logging/wmf_logging.module
index 5ffb452..0280a56 100644
--- a/sites/all/modules/wmf_logging/wmf_logging.module
+++ b/sites/all/modules/wmf_logging/wmf_logging.module
@@ -140,12 +140,16 @@
*/
function wmf_logging_format_message($entry) {
+ $uid = -1;
+ if ( isset( $entry[ 'user' ] ) ) {
+ $uid = $entry[ 'user' ]->uid;
+ }
$message = $entry[ 'type' ];
$message .= '|' . $entry[ 'timestamp' ];
$message .= '|' . $entry[ 'ip' ];
$message .= '|' . $entry[ 'request_uri' ];
$message .= '|' . $entry[ 'referer' ];
- $message .= '|' . $entry[ 'user' ]->uid;
+ $message .= '|' . $uid;
$message .= '|' . $entry[ 'link' ];
if (empty($entry[ 'variables' ])) {
--
To view, visit https://gerrit.wikimedia.org/r/187817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7f4e22292601c14fa79e9aa9c70d687f807728a
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
