Completed
Push — 7.x-3.x ( e551b9...7f7f72 )
by Devin
05:25
created
modules/commons_search_solr_user/commons_search_solr_user.module 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
       // Get the count of flagged users for a particular account.
89 89
       $fl_results = db_select('flagging', 'f')
90 90
         ->fields('f', array('entity_id', 'uid'))
91
-        ->condition('f.entity_type','user','=')
91
+        ->condition('f.entity_type', 'user', '=')
92 92
         ->condition('f.uid', $user->uid, '=')
93 93
         ->condition('f.fid', $flag->fid, '=')
94 94
         ->extend('PagerDefault')->limit($limit)
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
         ->execute();
113 113
       $user_ids = array_keys($results['user']);
114 114
       foreach ($user_ids as $uid) {
115
-        $out_results[] = user_view(user_load($uid), 'search_results');($user_ids);
115
+        $out_results[] = user_view(user_load($uid), 'search_results'); ($user_ids);
116 116
       }
117 117
       $build['pager'] = array(
118 118
         // As nice as it would be to make this use #theme, it is a bit more
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
       ),
160 160
       '#image_style' => '50x50',
161 161
       '#path' => array(
162
-        'path' => 'user/' . $build['#account']->uid,
162
+        'path' => 'user/'.$build['#account']->uid,
163 163
         'options' => array(
164 164
           'attributes' => array(
165 165
             'class' => array('user-picture'),
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
       $groups = array();
175 175
       foreach ($build['#account']->og_user_node[LANGUAGE_NONE] AS $og_node) {
176 176
         if ($gnode = node_load($og_node['target_id'])) {
177
-          $groups['group-item group-' . $gnode->nid] = array(
177
+          $groups['group-item group-'.$gnode->nid] = array(
178 178
             'title' => $gnode->title,
179
-            'href' => 'node/' . $gnode->nid,
179
+            'href' => 'node/'.$gnode->nid,
180 180
             'attributes' => array(
181 181
               'class' => array('group-link'),
182 182
             ),
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
       $form['custom_search_types']['#options'] = array_merge(array('s-user' => t('People')), $other_options);
250 250
     }
251 251
     //We want to override the #submit with our own, the other submits aren't relevant for the user page
252
-    $form['#submit'][]= 'commons_search_solr_user_search_submit';
252
+    $form['#submit'][] = 'commons_search_solr_user_search_submit';
253 253
   }
254 254
 }
255 255
 
@@ -283,8 +283,8 @@  discard block
 block discarded – undo
283 283
 function commons_search_solr_user_search_submit($form, &$form_state) {
284 284
   if ($form_state['values']['custom_search_types'] == 's-user') {
285 285
     $user_search_page = apachesolr_search_page_load('user_search');
286
-    $keys = '/' . $form_state['values']['search_block_form'];
287
-    $form_state['redirect'] = $user_search_page['search_path'] . $keys;
286
+    $keys = '/'.$form_state['values']['search_block_form'];
287
+    $form_state['redirect'] = $user_search_page['search_path'].$keys;
288 288
   }
289 289
 }
290 290
 
Please login to merge, or discard this patch.
commons/commons_follow/commons_follow_node/commons_follow_node.module 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
     ->condition('fid', $flag_ids, 'IN')
30 30
     ->condition('uid', $account->uid, '=')
31 31
     ->condition('entity_type', 'node', '=')
32
-    ->fields('f',array('entity_id'))
32
+    ->fields('f', array('entity_id'))
33 33
     ->execute()
34 34
     ->fetchAll();
35 35
   $nids = array();
36
-  foreach($result as $row) {
36
+  foreach ($result as $row) {
37 37
     $nids[] = (integer) $row->entity_id;
38 38
   }
39 39
 
Please login to merge, or discard this patch.
commons/commons_follow/commons_follow_term/commons_follow_term.module 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     ->condition('fid', $flag_ids, 'IN')
25 25
     ->condition('uid', $account->uid, '=')
26 26
     ->condition('entity_type', 'taxonomy_term', '=')
27
-    ->fields('f',array('entity_id'))
27
+    ->fields('f', array('entity_id'))
28 28
     ->execute()
29 29
     ->fetchAll();
30 30
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
   }
35 35
 
36 36
   $tids = array();
37
-  foreach($result as $row) {
37
+  foreach ($result as $row) {
38 38
     $tids[] = (integer) $row->entity_id;
39 39
   }
40 40
 
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
48 48
   $result = $query
49 49
     ->addTag('node_access')
50 50
     ->condition('tid', $tids, 'IN')
51
-    ->fields('t',array('nid'))
51
+    ->fields('t', array('nid'))
52 52
     ->groupBy('nid')
53 53
     ->execute()
54 54
     ->fetchAll();
55 55
 
56 56
   // Return the node IDs.
57 57
   $nids = array();
58
-  foreach($result as $row) {
58
+  foreach ($result as $row) {
59 59
     $nids[] = (integer) $row->nid;
60 60
   }
61 61
 
Please login to merge, or discard this patch.
commons/commons_follow/commons_follow_group/commons_follow_group.module 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
     ->condition('uid', $account->uid, '=')
30 30
     ->condition('entity_type', 'node', '=')
31 31
     ->condition('entity_id', $gids['node'], 'IN')
32
-    ->fields('f',array('entity_id'))
32
+    ->fields('f', array('entity_id'))
33 33
     ->execute()
34 34
     ->fetchAll();
35 35
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
   }
39 39
 
40 40
   $nids = array();
41
-  foreach($result as $row) {
41
+  foreach ($result as $row) {
42 42
     $nids[] = $row->entity_id;
43 43
   }
44 44
 
Please login to merge, or discard this patch.
commons/commons_follow/commons_follow_user/commons_follow_user.module 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     ->condition('fid', $flag_ids, 'IN')
27 27
     ->condition('uid', $account->uid, '=')
28 28
     ->condition('entity_type', 'user', '=')
29
-    ->fields('f',array('entity_id'))
29
+    ->fields('f', array('entity_id'))
30 30
     ->execute()
31 31
     ->fetchAll();
32 32
 
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
   }
37 37
 
38 38
   $uids = array();
39
-  foreach($result as $row) {
39
+  foreach ($result as $row) {
40 40
     $uids[] = (integer) $row->entity_id;
41 41
   }
42 42
 
Please login to merge, or discard this patch.
commons_follow/includes/views/handlers/commons_follow_handler_field_ops.inc 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,17 +40,17 @@
 block discarded – undo
40 40
 
41 41
       $flag_wrapper_classes_array = array();
42 42
       $flag_wrapper_classes_array[] = 'flag-wrapper';
43
-      $flag_wrapper_classes_array[] = 'flag-' . $variables['flag_css_name'];
44
-      $flag_wrapper_classes_array[] = 'flag-' . $variables['flag_css_name'] . '-' . $entity_id;
45
-      $variables['flag_wrapper_classes'] = implode(' ',$flag_wrapper_classes_array);
43
+      $flag_wrapper_classes_array[] = 'flag-'.$variables['flag_css_name'];
44
+      $flag_wrapper_classes_array[] = 'flag-'.$variables['flag_css_name'].'-'.$entity_id;
45
+      $variables['flag_wrapper_classes'] = implode(' ', $flag_wrapper_classes_array);
46 46
 
47 47
       $flag_classes_array = array();
48 48
       $flag_classes_array[] = 'flag';
49
-      $flag_classes_array[] = $action . '-action';
50
-      $flag_classes_array[] = 'flag-link-' . $flag->link_type;
49
+      $flag_classes_array[] = $action.'-action';
50
+      $flag_classes_array[] = 'flag-link-'.$flag->link_type;
51 51
       $variables['flag_classes'] = implode(' ', $flag_classes_array);
52 52
       $variables['is_flagged'] = $action;
53
-      $variables['link_text'] = $flag->get_label($action . '_short', $entity_id);
53
+      $variables['link_text'] = $flag->get_label($action.'_short', $entity_id);
54 54
 
55 55
       return theme('commons_follow_otheruser_flag', $variables);
56 56
     }
Please login to merge, or discard this patch.
modules/commons/commons_follow/commons_follow.module 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
  * Implements hook_form_alter().
130 130
  */
131 131
 function commons_follow_form_alter(&$form, &$form_state, $form_id) {
132
-  if ($form_id != 'views_exposed_form' || strpos($form['#id'],'views-exposed-form-commons-bw') !== 0 || empty($form['following'])) {
132
+  if ($form_id != 'views_exposed_form' || strpos($form['#id'], 'views-exposed-form-commons-bw') !== 0 || empty($form['following'])) {
133 133
     return;
134 134
   }
135 135
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
   // We don't use module_invoke_all() is we want to retain the array keys,
207 207
   // which are the user IDs.
208 208
   foreach (module_implements('commons_follow_get_nids') as $module) {
209
-    $function = $module . '_commons_follow_get_nids';
209
+    $function = $module.'_commons_follow_get_nids';
210 210
     $result = $function($account, $options);
211 211
     if (empty($result)) {
212 212
       continue;
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 function commons_follow_views_api() {
259 259
   return array(
260 260
     'api' => 3,
261
-    'path' => drupal_get_path('module', 'commons_follow') . '/includes/views',
261
+    'path' => drupal_get_path('module', 'commons_follow').'/includes/views',
262 262
   );
263 263
 }
264 264
 
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
   $followed_content = commons_follow_get_followed_content($account);
329 329
   $followed_mids = array();
330 330
   foreach ($followed_content as $key => $content) {
331
-    $function = $key . '_commons_follow_get_message_ids';
331
+    $function = $key.'_commons_follow_get_message_ids';
332 332
     if (function_exists($function)) {
333 333
       $function($followed_mids, $followed_content);
334 334
     }
@@ -353,12 +353,12 @@  discard block
 block discarded – undo
353 353
   }
354 354
 
355 355
   global $user;
356
-  $prefix = variable_get('message_subscribe_flag_prefix', 'subscribe') . '_';
356
+  $prefix = variable_get('message_subscribe_flag_prefix', 'subscribe').'_';
357 357
 
358 358
   if (strpos($view->name, $prefix) === 0 && isset($view->args[0]) && $user->uid != $view->args[0]) {
359 359
     $flag_content_keys = array_keys($query->table_queue);
360 360
 
361
-    foreach($flag_content_keys AS $key) {
361
+    foreach ($flag_content_keys AS $key) {
362 362
       if (strpos($key, 'flagging') === 0) {
363 363
         //Convert the Send Email Query
364 364
         $join = $query->table_queue[$key]['join'];
Please login to merge, or discard this patch.
views/handlers/commons_trusted_contacts_handler_send_message.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,6 +5,6 @@
 block discarded – undo
5 5
   function render($values) {
6 6
     global $user;
7 7
 
8
-    return l(t('Send private message'), 'user/' . $user->uid . '/contacts/messages/popup/' . $values->og_membership_etid);
8
+    return l(t('Send private message'), 'user/'.$user->uid.'/contacts/messages/popup/'.$values->og_membership_etid);
9 9
   }
10 10
 }
Please login to merge, or discard this patch.
commons/commons_follow/commons_follow_ui/commons_follow_ui.pages.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
   );
16 16
 
17 17
   $form['explanation'] = array(
18
-    '#markup' => '<p>' . t("Control how you are notified of new content and activity. When you follow a group, topic, user, or other content, you'll see updates in your content and activity streams, and you will automatically get email updates unless you disable emails or unfollow.") . '</p>',
18
+    '#markup' => '<p>'.t("Control how you are notified of new content and activity. When you follow a group, topic, user, or other content, you'll see updates in your content and activity streams, and you will automatically get email updates unless you disable emails or unfollow.").'</p>',
19 19
   );
20 20
 
21 21
   $form['message_subscribe_email'] = array(
Please login to merge, or discard this patch.