Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
72c28dd4
Unverified
Commit
72c28dd4
authored
3 years ago
by
Seamus Lee
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #20479 from demeritcowboy/userload
#2636
- Authx - Undefined function in drupal 9
parents
8d4d5423
6857c2f6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ext/authx/Civi/Authx/Drupal8.php
+2
-2
2 additions, 2 deletions
ext/authx/Civi/Authx/Drupal8.php
with
2 additions
and
2 deletions
ext/authx/Civi/Authx/Drupal8.php
+
2
−
2
View file @
72c28dd4
...
...
@@ -26,7 +26,7 @@ class Drupal8 implements AuthxInterface {
* @inheritDoc
*/
public
function
loginSession
(
$userId
)
{
$user
=
user_
load
(
$userId
);
$user
=
\Drupal\user\Entity\User
::
load
(
$userId
);
user_login_finalize
(
$user
);
}
...
...
@@ -41,7 +41,7 @@ class Drupal8 implements AuthxInterface {
* @inheritDoc
*/
public
function
loginStateless
(
$userId
)
{
$user
=
user_
load
(
$userId
);
$user
=
\Drupal\user\Entity\User
::
load
(
$userId
);
// In theory, we could use either account_switcher->switchTo() or current_user->setAccount().
// switchTo() sounds more conscientious, but setAccount() might be a more accurate rendition
// of "stateless login". At time of writing, there doesn't seem to be a compelling difference.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment