Part of #2047951: [META] Remove calls to deprecated global $user and $GLOBALS['user']

All places in History module should be fixed:
core/modules/block/block.module: $not_cacheable = $GLOBALS['user']->id() == 1 ||
core/modules/block/lib/Drupal/block/BlockAccessController.php: global $user;

CommentFileSizeAuthor
#3 block-remove-global-user-from-block-module-2062091-3.patch628 bytesm1r1k
#1 block-remove-global-user-from-block-module-2062091-1.patch1.93 KBm1r1k
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

m1r1k’s picture

m1r1k CreditAttribution: m1r1k commented
Status: Active » Needs review
Issue tags: +CodeSprintCIS
FileSize
block-remove-global-user-from-block-module-2062091-1.patch1.93 KB

Here is the patch

Status: Needs review » Needs work

The last submitted patch, block-remove-global-user-from-block-module-2062091-1.patch, failed testing.

m1r1k’s picture

m1r1k CreditAttribution: m1r1k commented
Status: Needs work » Needs review
FileSize
block-remove-global-user-from-block-module-2062091-3.patch628 bytes

Re-roll after #2062151: Create a current user service to ensure that current account is always available. Just minor fix left.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost commented
Status: Needs review » Reviewed & tested by the community

That's good clean-up

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
CreditAttribution: webchick commented
Status: Reviewed & tested by the community » Fixed

While I'd much rather do #2053489: Standardize on \Drupal throughout core, I confirm this is consistent with procedural code in core today, so seems like a reasonable fix.

Committed and pushed to 8.x. Thanks!

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
CreditAttribution: webchick commented

Hrm. Well. Committed, not yet pushed:

$ git push
fatal: remote error: Pushes to core are currently disabled.

I'll try again tomorrow. :P

Automatically closed -- issue fixed for 2 weeks with no activity.