Invalid message on initiating and terminating masquerading in watchdog. [#2743333]

Currently

Initiating masquerade: "User DestinationUser masqueraded as DestinationUser."
Terminating masquerade: "User SourceUser stopped masquerading as SourceUser."

Must be

Initiating masquerade: "User SourceUser masqueraded as DestinationUser."
Terminating masquerade: "User SourceUser stopped masquerading as DestinationUser."

Problem

Variable $account is changed by ...->setAccount();

$account = $this->currentUser;
...
$this->currentUser->setAccount($new_user);
...
$this->logger->info(..., $account->getDisplayName() );

Solution

- $account = $this->currentUser;
+ $account = $this->currentUser->getAccount();

Comment	File	Size	Author
#2	masquerade-2743333-fix-watchdog-begin-end-messages.patch	866 bytes	ragnarkurm
#2	8.x-2.x: PHP 5.6 & MySQL 5.5, D8.2 Patch failed to apply PHP 7 & MySQL 5.5, D8.2 Patch failed to apply

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

6 June 2016 at 12:04

ragnarkurm created an issue. See original summary.

Comment #2

ragnarkurm CreditAttribution: ragnarkurm as a volunteer commented 6 June 2016 at 12:25

File	Size
masquerade-2743333-fix-watchdog-begin-end-messages.patch	866 bytes
8.x-2.x: PHP 5.6 & MySQL 5.5, D8.2 Patch failed to apply PHP 7 & MySQL 5.5, D8.2 Patch failed to apply

Comment #3

ragnarkurm CreditAttribution: ragnarkurm as a volunteer and at Wunder commented 6 June 2016 at 12:26

Comment #4

andypost

he/him

Russian

CreditAttribution: andypost as a volunteer and at Skilld commented 6 June 2016 at 13:08

Status:

Active

» Needs review

Comment #5

hgoto CreditAttribution: hgoto as a volunteer commented 25 July 2016 at 01:40

Status:

Needs review

» Reviewed & tested by the community

I tested the patch #2 and I confirmed it fixes the issue. It's simple and I'd like to move this to RTBC.

The following is off-topic. How about changing the variable name for more code readability? For example, in the method switchTo(), the variable $account means the original account that going to masquerade another user. So $original_account is more easy-to-understand name than account, I think. But this may be against the policy or something. I'd like to hear other opinion.

Comment #6

25 July 2016 at 01:47

andypost committed 416682a on 8.x-2.x authored by ragnarkurm

Issue #2743333 by ragnarkurm: Invalid message on initiating and...

Comment #7

andypost

he/him

Russian

CreditAttribution: andypost as a volunteer and at Skilld commented 25 July 2016 at 01:51

Status:

Reviewed & tested by the community

» Fixed

Thanx, commited and pushed!

@hgoto Please file new issue, I think $target_account is nicely describes the target of the function but probably better to extend code comments and change local variable names - suggestions are welcome in separate issue)