Replace user_access() calls with $account->hasPermission() in aggregator module [#2061969]

Comment	File	Size	Author
#7	drupal-aggregator_replace_user_access-2061969-7.patch	605 bytes	andypost
#5	drupal-aggregator_replace_user_access-2061969-5.patch	7.27 KB	internetdevels
#3	drupal-aggregator_replace_user_access-2061969-3.patch	3.31 KB	internetdevels
#1	drupal-aggregator_replace_user_access-2061969.patch	3.55 KB	internetdevels

Comment #1

internetdevels commented 10 August 2013 at 15:58

Status:

Active

» Needs review

Status	File	Size
new	drupal-aggregator_replace_user_access-2061969.patch	3.55 KB

Looks like $request does not contain account in some cases, so I've used \Drupal::request(), not sure where I should look to fix this.

Log in or register to post comments

Comment #2

andypost

he/him

Russian

commented 29 August 2013 at 23:03

+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -144,7 +144,8 @@ function aggregator_load_feed_items($type, $data = NULL, $limit = 20) {
+  $account = Drupal::request()->attributes->get('_account');

@@ -457,7 +458,9 @@ function template_preprocess_aggregator_feed_source(&$variables) {
+  $account = Drupal::request()->attributes->get('_account');

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
@@ -45,9 +45,8 @@ public function appliesTo() {
+    $account = \Drupal::request()->attributes->get('_account');

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -38,7 +38,8 @@ public function settings() {
+    $account = \Drupal::request()->attributes->get('_account');

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -38,7 +38,8 @@ public function settings() {
+    $account = \Drupal::request()->attributes->get('_account');

Use Drupal::currentUser() service https://drupal.org/node/2032447

Log in or register to post comments

Comment #3

internetdevels commented 7 September 2013 at 14:17

Status	File	Size
new	drupal-aggregator_replace_user_access-2061969-3.patch	3.31 KB

New patch attached.

Log in or register to post comments

Comment #4

andypost

he/him

Russian

commented 7 September 2013 at 15:00

Status:

Needs review

» Postponed

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
@@ -44,10 +45,9 @@ public function appliesTo() {
-  public function access(Route $route, Request $request) {
...
+  public function access(Route $route, Request $request, AccountInterface $account = NULL) {
+    $account = is_null($account) ? \Drupal::currentUser() : $account;

Postponed til #2048223: Add $account argument to AccessCheckInterface::access() method and use the current_user service

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -37,7 +37,7 @@ public function settings() {
+    return \Drupal::currentUser()->hasPermission('access news feeds');

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -37,7 +37,7 @@ public function settings() {
+    return \Drupal::currentUser()->hasPermission('access news feeds');

This should be proper service injection