Completed
Push — 7.x-3.x ( 5c8d3e...a2ca3d )
by Devin
02:34
created
modules/commons/commons_posts/commons_posts.features.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_posts.features.inc
5
- */
3
+   * @file
4
+   * commons_posts.features.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_ctools_plugin_api().
Please login to merge, or discard this patch.
commons/commons_posts/commons_posts.features.og_features_permission.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_posts.features.og_features_permission.inc
5
- */
3
+   * @file
4
+   * commons_posts.features.og_features_permission.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_og_features_default_permissions().
Please login to merge, or discard this patch.
modules/commons/commons_posts/commons_posts.features.field_instance.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_posts.features.field_instance.inc
5
- */
3
+   * @file
4
+   * commons_posts.features.field_instance.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_field_default_field_instances().
Please login to merge, or discard this patch.
modules/commons/commons_posts/commons_posts.views_default.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_posts.views_default.inc
5
- */
3
+   * @file
4
+   * commons_posts.views_default.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_views_default_views().
Please login to merge, or discard this patch.
modules/commons/commons_posts/commons_posts.module 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * Code for the Commons Posts feature.
5
- */
3
+   * @file
4
+   * Code for the Commons Posts feature.
5
+   */
6 6
 
7 7
 include_once 'commons_posts.features.inc';
8 8
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 /**
74 74
  * Implements hook_strongarm_alter().
75 75
  */
76
- function commons_posts_strongarm_alter(&$items) {
76
+  function commons_posts_strongarm_alter(&$items) {
77 77
   // Expose the post content type for integration with Commons Radioactivity
78 78
   // and Commons Groups.
79 79
   foreach (array('commons_radioactivity_entity_types', 'commons_groups_entity_types') as $key) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 function commons_polls_form_node_form_alter(&$form, &$form_state, $form_id) {
26 26
   $node = $form['#node'];
27 27
 
28
-  list(, , $bundle) = entity_extract_ids('node', $node);
28
+  list(,, $bundle) = entity_extract_ids('node', $node);
29 29
 
30 30
   if ($bundle == 'poll' && empty($node->nid)) {
31 31
     drupal_set_title(t('Create a poll'));
Please login to merge, or discard this patch.
modules/commons/commons_groups/commons_groups.module 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * Code for the Commons Groups feature.
5
- */
3
+   * @file
4
+   * Code for the Commons Groups feature.
5
+   */
6 6
 
7 7
 include_once 'commons_groups.features.inc';
8 8
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
  */
68 68
 function commons_groups_help($path, $arg) {
69 69
   if (variable_get('commons_groups_needs_update', FALSE)) {
70
-    $message =  '<p>' . t("Drupal Commons 3.3 added a new, required field to control group privacy. Please edit your group(s) select one of the privacy options. Once all groups are
70
+    $message = '<p>' . t("Drupal Commons 3.3 added a new, required field to control group privacy. Please edit your group(s) select one of the privacy options. Once all groups are
71 71
       set, an administrator can dismiss the update notice.") . '</p>';
72 72
     if ($path == 'admin/content/groups/update') {
73 73
       return $message;
74 74
     }
75 75
     elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
76 76
       $node = menu_get_object();
77
-      if($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
77
+      if ($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
78 78
         return $message;
79 79
       }
80 80
     }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 function commons_groups_form_node_form_alter(&$form, &$form_state, $form_id) {
110 110
   $node = $form['#node'];
111 111
 
112
-  list(, , $bundle) = entity_extract_ids('node', $node);
112
+  list(,, $bundle) = entity_extract_ids('node', $node);
113 113
 
114 114
   // Customizations to the node form for entities that are group content.
115 115
   $group_content_entity_types = commons_groups_get_group_content_entity_types();
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
   if ($form_id == 'edit_profile_user_profile_form' || substr($form_id, -10) === '_node_form') {
362 362
     $internal_fields = array('field_unread_invitations', 'field_unread_messages', 'user_trusted_contacts', 'og_user_group_ref', 'group_access');
363 363
     foreach ($internal_fields as $field_name) {
364
-      if(isset($form[$field_name])) {
364
+      if (isset($form[$field_name])) {
365 365
         $form[$field_name]['#access'] = FALSE;
366 366
       }
367 367
     }
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
     // Determine whether the group is private according to the subscription
754 754
     // field.
755 755
     $private = $wrapper->field_og_subscribe_settings->value() == 'invitation';
756
-    $wrapper->{OG_ACCESS_FIELD}->set((int)$private);
756
+    $wrapper->{OG_ACCESS_FIELD}->set((int) $private);
757 757
     return;
758 758
   }
759 759
 
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
1073 1073
     return $element;
1074 1074
   }
1075 1075
 
1076
-  list($id, , $bundle) = entity_extract_ids($entity_type, $entity);
1076
+  list($id,, $bundle) = entity_extract_ids($entity_type, $entity);
1077 1077
 
1078 1078
   // The user has a pending membership request. Let her know that
1079 1079
   // her request is pending review.
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -71,8 +71,7 @@  discard block
 block discarded – undo
71 71
       set, an administrator can dismiss the update notice.") . '</p>';
72 72
     if ($path == 'admin/content/groups/update') {
73 73
       return $message;
74
-    }
75
-    elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
74
+    } elseif ($arg[0] == 'node' && $arg[2] == 'edit') {
76 75
       $node = menu_get_object();
77 76
       if($node->type == 'group' && empty($node->field_og_subscribe_settings)) {
78 77
         return $message;
@@ -178,11 +177,9 @@  discard block
 block discarded – undo
178 177
 
179 178
   if (!empty($permissions['subscribe without approval'])) {
180 179
     $subscribe_type = 'anyone';
181
-  }
182
-  elseif (!empty($permissions['subscribe'])) {
180
+  } elseif (!empty($permissions['subscribe'])) {
183 181
     $subscribe_type = 'approval';
184
-  }
185
-  else {
182
+  } else {
186 183
     $subscribe_type = 'invitation';
187 184
   }
188 185
 
@@ -313,8 +310,7 @@  discard block
 block discarded – undo
313 310
       $topics_text .= '!topic-' . $topic->tid;
314 311
       if ($topic == end($topics)) {
315 312
         $topics_text .= '.';
316
-      }
317
-      else {
313
+      } else {
318 314
         $topics_text .= ', ';
319 315
       }
320 316
       $t_args['!topic-' . $topic->tid] = l(t($topic->name), 'taxonomy/term/' . $topic->tid);
@@ -971,8 +967,7 @@  discard block
 block discarded – undo
971 967
       if (!empty($account->picture->uri)) {
972 968
         $filepath = $account->picture->uri;
973 969
       }
974
-    }
975
-    elseif (variable_get('user_picture_default', '')) {
970
+    } elseif (variable_get('user_picture_default', '')) {
976 971
       $filepath = variable_get('user_picture_default', '');
977 972
     }
978 973
 
@@ -1099,8 +1094,7 @@  discard block
 block discarded – undo
1099 1094
         $links['href'] = "group/$entity_type/$id/unsubscribe";
1100 1095
       }
1101 1096
     }
1102
-  }
1103
-  else {
1097
+  } else {
1104 1098
     // Check if user can subscribe to the field.
1105 1099
     if (empty($settings['field_name']) && $audience_field_name = og_get_best_group_audience_field('user', $account, $entity_type, $bundle)) {
1106 1100
       $settings['field_name'] = $audience_field_name;
@@ -1147,13 +1141,11 @@  discard block
 block discarded – undo
1147 1141
           $links['title'] = t('Join group');
1148 1142
           if ($account->uid) {
1149 1143
             $links['href'] = $url;
1150
-          }
1151
-          else {
1144
+          } else {
1152 1145
             $links['href'] = 'user/login';
1153 1146
             $links['options'] = array('query' => array('destination' => $url));
1154 1147
           }
1155
-        }
1156
-        else {
1148
+        } else {
1157 1149
           $element[0] = array('#markup' => '<div class="subscription-type">' . t('Invite-only group') . '</div>');
1158 1150
           return $element;
1159 1151
         }
@@ -1228,8 +1220,7 @@  discard block
 block discarded – undo
1228 1220
       foreach ($roles as $rid => $rolename) {
1229 1221
         if (in_array($rolename, $details['roles'])) {
1230 1222
           $grant[$rid][] = $perm;
1231
-        }
1232
-        else {
1223
+        } else {
1233 1224
           $revoke[$rid][] = $perm;
1234 1225
         }
1235 1226
       }
Please login to merge, or discard this patch.
modules/commons/commons_groups/commons_groups.features.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_groups.features.inc
5
- */
3
+   * @file
4
+   * commons_groups.features.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_features_pipe_alter().
Please login to merge, or discard this patch.
modules/commons/commons_groups/commons_groups.commons.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * Commons module integration for the Commons Groups module.
5
- */
3
+   * @file
4
+   * Commons module integration for the Commons Groups module.
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_commons_entity_integration().
Please login to merge, or discard this patch.
modules/commons_groups_directory/commons_groups_directory.features.inc 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file
4
- * commons_groups_directory.features.inc
5
- */
3
+   * @file
4
+   * commons_groups_directory.features.inc
5
+   */
6 6
 
7 7
 /**
8 8
  * Implements hook_ctools_plugin_api().
Please login to merge, or discard this patch.