comparison core/modules/comment/comment.tokens.inc @ 18:af1871eacc83

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:33:08 +0100
parents 129ea1e6d783
children
comparison
equal deleted inserted replaced
17:129ea1e6d783 18:af1871eacc83
178 break; 178 break;
179 179
180 // Comment related URLs. 180 // Comment related URLs.
181 case 'url': 181 case 'url':
182 $url_options['fragment'] = 'comment-' . $comment->id(); 182 $url_options['fragment'] = 'comment-' . $comment->id();
183 $replacements[$original] = $comment->url('canonical', $url_options); 183 $replacements[$original] = $comment->toUrl('canonical', $url_options)->toString();
184 break; 184 break;
185 185
186 case 'edit-url': 186 case 'edit-url':
187 $url_options['fragment'] = NULL; 187 $url_options['fragment'] = NULL;
188 $replacements[$original] = $comment->url('edit-form', $url_options); 188 $replacements[$original] = $comment->toUrl('edit-form', $url_options)->toString();
189 break; 189 break;
190 190
191 case 'author': 191 case 'author':
192 $name = $comment->getAuthorName(); 192 $name = $comment->getAuthorName();
193 // Add the user cacheability metadata in case the author of the comment 193 // Add the user cacheability metadata in case the author of the comment
207 break; 207 break;
208 208
209 case 'created': 209 case 'created':
210 $date_format = DateFormat::load('medium'); 210 $date_format = DateFormat::load('medium');
211 $bubbleable_metadata->addCacheableDependency($date_format); 211 $bubbleable_metadata->addCacheableDependency($date_format);
212 $replacements[$original] = format_date($comment->getCreatedTime(), 'medium', '', NULL, $langcode); 212 $replacements[$original] = \Drupal::service('date.formatter')->format($comment->getCreatedTime(), 'medium', '', NULL, $langcode);
213 break; 213 break;
214 214
215 case 'changed': 215 case 'changed':
216 $date_format = DateFormat::load('medium'); 216 $date_format = DateFormat::load('medium');
217 $bubbleable_metadata->addCacheableDependency($date_format); 217 $bubbleable_metadata->addCacheableDependency($date_format);
218 $replacements[$original] = format_date($comment->getChangedTime(), 'medium', '', NULL, $langcode); 218 $replacements[$original] = \Drupal::service('date.formatter')->format($comment->getChangedTime(), 'medium', '', NULL, $langcode);
219 break; 219 break;
220 220
221 case 'entity': 221 case 'entity':
222 $entity = $comment->getCommentedEntity(); 222 $entity = $comment->getCommentedEntity();
223 $bubbleable_metadata->addCacheableDependency($entity); 223 $bubbleable_metadata->addCacheableDependency($entity);