Test Setup Failed
Pull Request — gcconnex (#1459)
by Ilia
05:10
created
engine/classes/ElggRelationship.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,6 @@
 block discarded – undo
249 249
 	 * Import a relationship
250 250
 	 *
251 251
 	 * @param ODD $data ODD data
252
-
253 252
 	 * @return bool
254 253
 	 * @throws ImportException|InvalidParameterException
255 254
 	 * @deprecated 1.9
Please login to merge, or discard this patch.
engine/classes/ElggEntity.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1673,13 +1673,11 @@  discard block
 block discarded – undo
1673 1673
 						values
1674 1674
 						('$type', $subtype_id, $owner_guid, $site_guid, $container_guid,
1675 1675
 							$access_id, $time_created, $now, $now, 'no', '$duplicate_check')");
1676
-				}
1677
-				catch( DatabaseException $e ){
1676
+				} catch( DatabaseException $e ){
1678 1677
 					error_log("Duplication prevented: " . $e->getMessage());
1679 1678
 					return null;
1680 1679
 				}
1681
-			}
1682
-			else{
1680
+			} else{
1683 1681
 				$result = $this->getDatabase()->insertData("INSERT into {$CONFIG->dbprefix}entities
1684 1682
 						(type, subtype, owner_guid, site_guid, container_guid,
1685 1683
 							access_id, time_created, time_updated, last_action, enabled)
@@ -1687,8 +1685,7 @@  discard block
 block discarded – undo
1687 1685
 						('$type', $subtype_id, $owner_guid, $site_guid, $container_guid,
1688 1686
 							$access_id, $time_created, $now, $now, 'no')");
1689 1687
 			}
1690
-		}
1691
-		else {
1688
+		} else {
1692 1689
 			$result = $this->getDatabase()->insertData("INSERT into {$CONFIG->dbprefix}entities
1693 1690
 				(type, subtype, owner_guid, site_guid, container_guid,
1694 1691
 					access_id, time_created, time_updated, last_action)
Please login to merge, or discard this patch.
engine/classes/Elgg/Database/AccessCollections.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -724,13 +724,13 @@
 block discarded – undo
724 724
 	}
725 725
 	
726 726
 	/**
727
-	* Get all of members of an access collection
728
-	*
729
-	* @param int  $collection_id The collection's ID
730
-	* @param bool $guids_only    If set to true, will only return the members' GUIDs (default: false)
731
-	*
732
-	* @return ElggUser[]|int[]|false guids or entities if successful, false if not
733
-	*/
727
+	 * Get all of members of an access collection
728
+	 *
729
+	 * @param int  $collection_id The collection's ID
730
+	 * @param bool $guids_only    If set to true, will only return the members' GUIDs (default: false)
731
+	 *
732
+	 * @return ElggUser[]|int[]|false guids or entities if successful, false if not
733
+	 */
734 734
 	function getMembers($collection_id, $guids_only = false) {
735 735
 		$collection_id = (int) $collection_id;
736 736
 
Please login to merge, or discard this patch.
engine/lib/input.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -214,8 +214,7 @@
 block discarded – undo
214 214
 // for the group members search: group guid - should be numeric
215 215
 	if (!$g = get_input('term', get_input('g'))){
216 216
 		$g=0;
217
-	}
218
-	else {
217
+	} else {
219 218
 		$g = sanitise_string($g);
220 219
 
221 220
 		// replace mysql vars with escaped strings
Please login to merge, or discard this patch.
engine/lib/views.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -488,7 +488,7 @@
 block discarded – undo
488 488
 	} else if ( elgg_is_active_plugin('wet4') ) {
489 489
 		//add translation
490 490
 		$params['title'] = gc_explode_translation($title,get_current_language()) . ' : ' . elgg_get_config('sitename');
491
-	}else {
491
+	} else {
492 492
 		//add translation
493 493
 		$params['title'] = $title . ' : ' . elgg_get_config('sitename');
494 494
 	}
Please login to merge, or discard this patch.
languages/fr.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -335,8 +335,8 @@
 block discarded – undo
335 335
  */
336 336
 	'feed:rss' => "S'abonner au fil RSS de cette page",
337 337
 /**
338
- * Links
339
- */
338
+	 * Links
339
+	 */
340 340
 	'link:view' => "voir le lien",
341 341
 	'link:view:all' => "Voir tout",
342 342
 
Please login to merge, or discard this patch.
languages/en.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -312,8 +312,8 @@
 block discarded – undo
312 312
  */
313 313
 	'feed:rss' => 'RSS feed for this page',
314 314
 /**
315
- * Links
316
- */
315
+	 * Links
316
+	 */
317 317
 	'link:view' => 'view link',
318 318
 	'link:view:all' => 'View all',
319 319
 
Please login to merge, or discard this patch.
mod/au_subgroups/views/default/au_subgroups/group_module.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 
17 17
 if ($group->canEdit()) {
18 18
   $all_link = elgg_view('output/url', array(
19
-    'href' => "groups/subgroups/{$group->guid}/all",
20
-    'text' => elgg_echo('link:view:all'),
21
-    'is_trusted' => true,
19
+	'href' => "groups/subgroups/{$group->guid}/all",
20
+	'text' => elgg_echo('link:view:all'),
21
+	'is_trusted' => true,
22 22
   ));
23 23
 }
24 24
 
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 $any_member = ($group->subgroups_members_create_enable != 'no');
34 34
  if (($any_member && $group->isMember()) || $group->canEdit()) {
35 35
   $new_link = elgg_view('output/url', array(
36
-    'href' => "groups/subgroups/add/$group->guid",
37
-    'text' => elgg_echo('au_subgroups:add:subgroup'),
38
-    'is_trusted' => true,
36
+	'href' => "groups/subgroups/add/$group->guid",
37
+	'text' => elgg_echo('au_subgroups:add:subgroup'),
38
+	'is_trusted' => true,
39 39
   ));
40 40
 }
41 41
 else {
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,7 @@
 block discarded – undo
37 37
     'text' => elgg_echo('au_subgroups:add:subgroup'),
38 38
     'is_trusted' => true,
39 39
   ));
40
-}
41
-else {
40
+} else {
42 41
   $new_link = '';
43 42
 }
44 43
 
Please login to merge, or discard this patch.
mod/au_subgroups/views/default/au_subgroups/search_results.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,8 +5,7 @@  discard block
 block discarded – undo
5 5
 if ($vars['subgroup_guid']) {
6 6
   $subgroup_guid = $vars['subgroup_guid'];
7 7
   $subgroup = get_entity($subgroup_guid);
8
-}
9
-else {
8
+} else {
10 9
   $subgroup = elgg_get_page_owner_entity();
11 10
 }
12 11
 
@@ -21,8 +20,7 @@  discard block
 block discarded – undo
21 20
 
22 21
 if (empty($vars['q'])) {
23 22
   $options['order_by'] = "g.name ASC";
24
-}
25
-else {
23
+} else {
26 24
   $query = sanitize_string($vars['q']);
27 25
   $options['wheres'][] = "g.name LIKE '%{$query}%'";
28 26
 }
@@ -42,8 +40,7 @@  discard block
 block discarded – undo
42 40
 	
43 41
 	if (can_move_subgroup($subgroup, $groups[$i])) {
44 42
 	  $class = 'au-subgroups-parentable';
45
-	}
46
-	else {
43
+	} else {
47 44
 	  $class = 'au-subgroups-non-parentable';
48 45
 	}
49 46
 	
@@ -55,8 +52,7 @@  discard block
 block discarded – undo
55 52
   }
56 53
   
57 54
   echo '</div>';
58
-}
59
-else {
55
+} else {
60 56
   echo elgg_echo('au_subgroups:search:noresults');
61 57
 }
62 58
 elgg_pop_context();
Please login to merge, or discard this patch.