diff --git a/core/modules/tracker/lib/Drupal/tracker/Access/UserTrackerAccessCheck.php b/core/modules/tracker/lib/Drupal/tracker/Access/UserTrackerAccessCheck.php index 673d12c..cf6ac1b 100644 --- a/core/modules/tracker/lib/Drupal/tracker/Access/UserTrackerAccessCheck.php +++ b/core/modules/tracker/lib/Drupal/tracker/Access/UserTrackerAccessCheck.php @@ -28,9 +28,11 @@ public function appliesTo() { */ public function access(Route $route, Request $request) { // The user object from the User ID in the path. - $account = $request->attributes->get('user'); - $user = \Drupal::currentUser(); - return $user->hasPermission('access content') && $account->access('view', $user); + $user = $request->attributes->get('user'); + // @todo - $account should be passed in. + // The \Drupal\Core\Session\AccountInterface $account trying to access this. + $account = \Drupal::currentUser(); + return $account->hasPermission('access content') && $user->access('view', $account); } } diff --git a/core/modules/tracker/lib/Drupal/tracker/Access/ViewOwnTrackerAccessCheck.php b/core/modules/tracker/lib/Drupal/tracker/Access/ViewOwnTrackerAccessCheck.php index e5a2738..f448345 100644 --- a/core/modules/tracker/lib/Drupal/tracker/Access/ViewOwnTrackerAccessCheck.php +++ b/core/modules/tracker/lib/Drupal/tracker/Access/ViewOwnTrackerAccessCheck.php @@ -28,9 +28,11 @@ public function appliesTo() { */ public function access(Route $route, Request $request) { // The user object from the User ID in the path. - $account = $request->attributes->get('user'); - $user = \Drupal::currentUser(); - return $user->isAuthenticated() && ($user->id() == $account->id()) && $user->hasPermission('access content'); + $user = $request->attributes->get('user'); + // @todo - $account should be passed in. + // The \Drupal\Core\Session\AccountInterface $account trying to access this. + $account = \Drupal::currentUser(); + return $account->isAuthenticated() && ($user->id() == $account->id()) && $account->hasPermission('access content'); } } diff --git a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerPage.php b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerPage.php index 90c91e5..a9d667a 100644 --- a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerPage.php +++ b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerPage.php @@ -9,13 +9,13 @@ use Drupal\Core\Controller\ControllerBase; - /** - * Controller for tracker.page route. - */ +/** + * Controller for tracker.page route. + */ class TrackerPage extends ControllerBase { /** - * Content callback for tracker.page route + * Content callback for the tracker.page route. */ public function getContent() { module_load_include('inc', 'tracker', 'tracker.pages'); diff --git a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserRecent.php b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserRecent.php index ba3db60..4b644ae 100644 --- a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserRecent.php +++ b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserRecent.php @@ -16,7 +16,7 @@ class TrackerUserRecent extends ControllerBase { /** - * Content callback for tracker.users_recent_content route + * Content callback for the tracker.users_recent_content route. */ public function getContent(UserInterface $user) { module_load_include('inc', 'tracker', 'tracker.pages'); diff --git a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserTab.php b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserTab.php index df8f102..cb595f7 100644 --- a/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserTab.php +++ b/core/modules/tracker/lib/Drupal/tracker/Controller/TrackerUserTab.php @@ -15,13 +15,17 @@ * Controller for tracker.user_tab route. */ class TrackerUserTab extends ControllerBase { + + /** + * Content callback for the tracker.user_tab route. + */ public function getContent(UserInterface $user) { module_load_include('inc', 'tracker', 'tracker.pages'); return tracker_page($user); } /** - * Content callback for tracker.user_tab route + * Title callback for the tracker.user_tab route. */ public function getTitle(UserInterface $user) { return String::checkPlain(user_format_name($user));