projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da0c485
)
Drupal8 loadBootStrap: fix user variable.
author
Mathieu Lutfy
<mathieu@bidon.ca>
Mon, 9 Apr 2018 02:44:50 +0000
(22:44 -0400)
committer
Mathieu Lutfy
<mathieu@bidon.ca>
Mon, 9 Apr 2018 02:44:50 +0000
(22:44 -0400)
CRM/Utils/System/Drupal8.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/System/Drupal8.php
b/CRM/Utils/System/Drupal8.php
index 75f3f99701ad0b6c002678d7b0c289b760486860..9eaf10a912aa8ab492960157bd6a236fdb3650d2 100644
(file)
--- a/
CRM/Utils/System/Drupal8.php
+++ b/
CRM/Utils/System/Drupal8.php
@@
-440,7
+440,7
@@
class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
CRM_Utils_Hook::config($config);
if ($loadUser) {
- if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($
uid
)->getUsername()) {
+ if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($
params['uid']
)->getUsername()) {
$this->loadUser($username);
}
elseif (!empty($params['name']) && !empty($params['pass']) && \Drupal::service('user.auth')->authenticate($params['name'], $params['pass'])) {