diff --git a/src/Controller/DisqusController.php b/src/Controller/DisqusController.php index 6efe6db..d2178bc 100644 --- a/src/Controller/DisqusController.php +++ b/src/Controller/DisqusController.php @@ -23,12 +23,12 @@ class DisqusController extends ControllerBase { */ public function closeWindow() { $build = array(); - $build['#markup'] = t('Thank you for logging in. Please close this window, or click here to continue.', - array('!clickhere' => 'javascript:window.close();')); - $build['#attached']['html_head'][] = array( array( + $build['#markup'] = t('Thank you for logging in. Please close this window, or click here to continue.', + array('@clickhere' => 'javascript:window.close();')); + $build['#attached']['html_head'][] = [[ '#tag' => 'script', '#value' => 'window.close();', - ), 'disqus_js'); + ], 'disqus_js']; return $build; } diff --git a/src/DisqusCommentManager.php b/src/DisqusCommentManager.php index 7c36b28..7618623 100644 --- a/src/DisqusCommentManager.php +++ b/src/DisqusCommentManager.php @@ -98,7 +98,7 @@ class DisqusCommentManager implements DisqusCommentManagerInterface { $disqus['sso'] = [ 'name' => \Drupal::config('system.site')->get('name'), // The login window must be closed once the user logs in. - 'url' => Url::fromRoute('user.login', array(), array('query' => array('destination' => Url::fromRoute('disqus.close_window')->toString()), 'absolute' => TRUE))->toString(), + 'url' => Url::fromRoute('user.login', [], ['query' => array('destination' => Url::fromRoute('disqus.close_window')->toString()), 'absolute' => TRUE])->toString(), // The logout link must redirect back to the original page. 'logout' => Url::fromRoute('user.logout', [], ['query' => ['destination' => Url::fromRoute('')->toString()], 'absolute' => TRUE])->toString(), 'width' => 800,