Mercurial > hg > isophonics-drupal-site
comparison core/modules/user/user.tokens.inc @ 18:af1871eacc83
Update to Drupal core 8.7.1
author | Chris Cannam |
---|---|
date | Thu, 09 May 2019 15:33:08 +0100 |
parents | 4c8ae668cc8c |
children |
comparison
equal
deleted
inserted
replaced
17:129ea1e6d783 | 18:af1871eacc83 |
---|---|
116 case 'mail': | 116 case 'mail': |
117 $replacements[$original] = $account->getEmail(); | 117 $replacements[$original] = $account->getEmail(); |
118 break; | 118 break; |
119 | 119 |
120 case 'url': | 120 case 'url': |
121 $replacements[$original] = $account->id() ? $account->url('canonical', $url_options) : t('not yet assigned'); | 121 $replacements[$original] = $account->id() ? $account->toUrl('canonical', $url_options)->toString() : t('not yet assigned'); |
122 break; | 122 break; |
123 | 123 |
124 case 'edit-url': | 124 case 'edit-url': |
125 $replacements[$original] = $account->id() ? $account->url('edit-form', $url_options) : t('not yet assigned'); | 125 $replacements[$original] = $account->id() ? $account->toUrl('edit-form', $url_options)->toString() : t('not yet assigned'); |
126 break; | 126 break; |
127 | 127 |
128 // These tokens are default variations on the chained tokens handled below. | 128 // These tokens are default variations on the chained tokens handled below. |
129 case 'last-login': | 129 case 'last-login': |
130 $date_format = DateFormat::load('medium'); | 130 $date_format = DateFormat::load('medium'); |
131 $bubbleable_metadata->addCacheableDependency($date_format); | 131 $bubbleable_metadata->addCacheableDependency($date_format); |
132 $replacements[$original] = $account->getLastLoginTime() ? format_date($account->getLastLoginTime(), 'medium', '', NULL, $langcode) : t('never'); | 132 $replacements[$original] = $account->getLastLoginTime() ? \Drupal::service('date.formatter')->format($account->getLastLoginTime(), 'medium', '', NULL, $langcode) : t('never'); |
133 break; | 133 break; |
134 | 134 |
135 case 'created': | 135 case 'created': |
136 $date_format = DateFormat::load('medium'); | 136 $date_format = DateFormat::load('medium'); |
137 $bubbleable_metadata->addCacheableDependency($date_format); | 137 $bubbleable_metadata->addCacheableDependency($date_format); |
138 // In the case of user_presave the created date may not yet be set. | 138 // In the case of user_presave the created date may not yet be set. |
139 $replacements[$original] = $account->getCreatedTime() ? format_date($account->getCreatedTime(), 'medium', '', NULL, $langcode) : t('not yet created'); | 139 $replacements[$original] = $account->getCreatedTime() ? \Drupal::service('date.formatter')->format($account->getCreatedTime(), 'medium', '', NULL, $langcode) : t('not yet created'); |
140 break; | 140 break; |
141 } | 141 } |
142 } | 142 } |
143 | 143 |
144 if ($login_tokens = $token_service->findWithPrefix($tokens, 'last-login')) { | 144 if ($login_tokens = $token_service->findWithPrefix($tokens, 'last-login')) { |