Completed
Push — develop ( b9405a...d8b156 )
by Greg
23:40 queued 13:28
created
app/Family.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
344 344
 			$husb_names = [];
345 345
 			if ($this->husb) {
346
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
346
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
347 347
 			}
348 348
 			// If the individual only has married names, create a dummy birth name.
349 349
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
 			$wife_names = [];
361 361
 			if ($this->wife) {
362
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
362
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
363 363
 			}
364 364
 			// If the individual only has married names, create a dummy birth name.
365 365
 			if (empty($wife_names)) {
Please login to merge, or discard this patch.
app/Theme/CloudsTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 			if (!empty($menu->getSubmenus())) {
107 107
 				// Insert a dummy menu / label into the submenu
108 108
 				$submenus = $menu->getSubmenus();
109
-				array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;']));
109
+				array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;']));
110 110
 				$menu->setSubmenus($submenus);
111 111
 			}
112 112
 
Please login to merge, or discard this patch.
app/Functions/FunctionsEdit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 		} elseif ($fact === 'REPO') {
648 648
 			echo
649 649
 				'<div class="input-group">' .
650
-				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' .				self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
650
+				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
651 651
 				'</div>';
652 652
 		} elseif ($fact === 'RESN') {
653 653
 			echo Bootstrap4::select(FunctionsEdit::optionsRestrictions(true), $value, ['id' => $element_id, 'name' => $element_name]);
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 		} elseif ($fact === 'TYPE' && $level === 0) {
776 776
 			// NAME TYPE : hide text field and show a selection list
777 777
 			echo Bootstrap4::select(GedcomCodeName::getValues($person), $value, ['id' => $element_id, 'name' => $element_name, 'onchange' => 'onchange="document.getElementById(\'' . $element_id . '\').value=this.value;"']);
778
-			echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>';		}
778
+			echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>'; }
779 779
 
780 780
 		// popup links
781 781
 		switch ($fact) {
Please login to merge, or discard this patch.
app/Database.php 1 patch
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@  discard block
 block discarded – undo
85 85
 		// Create the underlying PDO object
86 86
 		self::$pdo = new PDO(
87 87
 			(substr($DBHOST, 0, 1) === '/' ?
88
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
89
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
88
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
90 89
 			),
91 90
 			$DBUSER, $DBPASS,
92 91
 			[
@@ -161,7 +160,7 @@  discard block
 block discarded – undo
161 160
 			}
162 161
 		}
163 162
 		$milliseconds = sprintf('%.3f', $microseconds * 1000);
164
-		self::$log[] = '<tr><td>' .$stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
163
+		self::$log[] = '<tr><td>' . $stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
165 164
 	}
166 165
 
167 166
 	/**
Please login to merge, or discard this patch.
app/Functions/FunctionsCharts.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -297,9 +297,9 @@
 block discarded – undo
297 297
 
298 298
 		if ($sosa == 0 && Auth::isEditor($family->getTree())) {
299 299
 			echo '<br>';
300
-			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
301
-			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
302
-			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
300
+			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
301
+			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
302
+			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
303 303
 			echo '<br><br>';
304 304
 		}
305 305
 		echo '</td>';
Please login to merge, or discard this patch.
app/Controller/FamilyController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,11 +77,11 @@
 block discarded – undo
77 77
 			$menu->addSubmenu(new Menu(I18N::translate('Change family members'), 'edit_interface.php?action=changefamily&ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref(), 'menu-fam-change'));
78 78
 
79 79
 			// edit_fam / add child
80
-			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&amp;ged=' . $this->record->getTree()->getNameHtml() .'&amp;xref=' . $this->record->getXref() . '&amp;gender=U', 'menu-fam-addchil'));
80
+			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&amp;ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref() . '&amp;gender=U', 'menu-fam-addchil'));
81 81
 
82 82
 			// edit_fam / reorder_children
83 83
 			if ($this->record->getNumberOfChildren() > 1) {
84
-				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() .'&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
84
+				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
85 85
 			}
86 86
 
87 87
 			// delete
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
1081 1081
 		)->fetchAssoc();
1082 1082
 
1083
-		$html     = '';
1083
+		$html = '';
1084 1084
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
1085 1085
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
1086 1086
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1146,7 +1146,7 @@  discard block
 block discarded – undo
1146 1146
 		)->fetchAssoc();
1147 1147
 
1148 1148
 		$html = '';
1149
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
1149
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
1150 1150
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
1151 1151
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
1152 1152
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1573,7 +1573,7 @@  discard block
 block discarded – undo
1573 1573
 					if ($endjd === $startjd) {
1574 1574
 						$html .= I18N::translate('No events exist for tomorrow.');
1575 1575
 					} else {
1576
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1576
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1577 1577
 					}
1578 1578
 				} else {
1579 1579
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.