X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fviews_ui%2Fsrc%2FViewEditForm.php;h=dd6b6d2f1c73814f112912c4939f50b322a61e18;hp=75b518fdc863212a44ce8a08a41996ff5b635e0f;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5 diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php index 75b518fdc..dd6b6d2f1 100644 --- a/web/core/modules/views_ui/src/ViewEditForm.php +++ b/web/core/modules/views_ui/src/ViewEditForm.php @@ -129,7 +129,7 @@ class ViewEditForm extends ViewFormBase { '#account' => $this->entityManager->getStorage('user')->load($view->lock->owner), ]; $lock_message_substitutions = [ - '@user' => drupal_render($username), + '@user' => \Drupal::service('renderer')->render($username), '@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated), ':url' => $view->url('break-lock-form'), ]; @@ -162,7 +162,6 @@ class ViewEditForm extends ViewFormBase { ], ]; - $form['displays']['top'] = $this->renderDisplayTop($view); // The rest requires a display to be selected. @@ -262,7 +261,7 @@ class ViewEditForm extends ViewFormBase { // options. $display_handler = $executable->displayHandlers->get($id); if ($attachments = $display_handler->getAttachedDisplays()) { - foreach ($attachments as $attachment ) { + foreach ($attachments as $attachment) { $attached_options = $executable->displayHandlers->get($attachment)->getOption('displays'); unset($attached_options[$id]); $executable->displayHandlers->get($attachment)->setOption('displays', $attached_options);