openinfra
/
groups
Code Issues Proposed changes

Resolve commons_activity_streams errors 

The commons_activity_streams_message_access_alter hook was not
checking for empty arrays, and throw a ton of notice and
warning messages.

Related issue report:
https://www.drupal.org/node/2596651

Change-Id: Ife614d97908758b01f927ed01656a0962e5a44cb
This commit is contained in:
Marton Kiss 2016-10-14 10:58:47 +02:00
parent 98e1d18f56
commit d85c1e9e67
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commons.make
View File

@ -6,4 +6,5 @@ projects[commons][type] = "profile"
projects[commons][version] = "3.39"
projects[commons][patch][] = "patches/0005-commons-libraries-search-paths-alter.patch"
projects[commons][patch][] = "patches/0004-accomodate-flag-v3.patch"
projects[commons][patch][] = "patches/0009-commons-flag-v3.patch"
projects[commons][patch][] = "patches/0009-commons-flag-v3.patch"
projects[commons][patch][] = "patches/0010-commons-activity-streams-warning.patch"

22
patches/0010-commons-activity-streams-warning.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/modules/commons/commons_activity_streams/commons_activity_streams.module.orig b/modules/commons/commons_activity_streams/commons_activity_streams.module
index 854b4f3..30b0f92 100644
--- a/modules/commons/commons_activity_streams/commons_activity_streams.module.orig
+++ b/modules/commons/commons_activity_streams/commons_activity_streams.module
@@ -98,7 +98,7 @@ function commons_activity_streams_message_access_alter(&$access, $context) {
$message = $context['entity'];
// Verify view access to nodes referenced in the message.
- if (isset($message->field_target_nodes)) {
+ if ((isset($message->field_target_nodes)) && (!empty($message->field_target_nodes))) {
foreach ($message->field_target_nodes[LANGUAGE_NONE] as $key => $value) {
$node = node_load($value['target_id']);
if (!node_access('view', $node, $context['account'])) {
@@ -110,7 +110,7 @@ function commons_activity_streams_message_access_alter(&$access, $context) {
}
}
// Verify view access to comments referenced in the message.
- if (isset($message->field_target_comments)) {
+ if ((isset($message->field_target_comments)) && (!empty($message->field_target_comments))) {
foreach ($message->field_target_comments[LANGUAGE_NONE] as $key => $value) {
$comment = comment_load($value['target_id']);
if (!entity_access('view', 'comment', $comment, $context['account'])) {