Completed
Push — develop ( 691984...abce9f )
by Greg
09:05
created
app/Database.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@
 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
 			array(
Please login to merge, or discard this patch.
medialist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 						</option>
110 110
 					</select>
111 111
 				</td>
112
-				<?php else: ?>
112
+				<?php else : ?>
113 113
 					<td class="descriptionbox wrap"></td>
114 114
 					<td class="optionbox wrap"></td>
115 115
 				<?php endif ?>
Please login to merge, or discard this patch.
app/Theme/ColorsTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	protected function formatSecondaryMenu() {
50 50
 		return
51 51
 			'<ul class="secondary-menu">' .
52
-			implode('', array_map(function(Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) .
52
+			implode('', array_map(function (Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) .
53 53
 			'<li>' .
54 54
 			$this->formQuickSearch() .
55 55
 			'</li>' .
Please login to merge, or discard this patch.
app/Module/BatchUpdate/BatchUpdateBasePlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 	public static function createEditLinks($gedrec, GedcomRecord $record) {
149 149
 		return preg_replace(
150 150
 			"/@([^#@\n]+)@/m",
151
-			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() .'">@\\1@</a>',
151
+			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() . '">@\\1@</a>',
152 152
 			$gedrec
153 153
 		);
154 154
 	}
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
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			"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"
1090 1090
 		)->fetchAssoc();
1091 1091
 
1092
-		$html     = '';
1092
+		$html = '';
1093 1093
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
1094 1094
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
1095 1095
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 		)->fetchAssoc();
1156 1156
 
1157 1157
 		$html = '';
1158
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
1158
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
1159 1159
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
1160 1160
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
1161 1161
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1585,7 +1585,7 @@  discard block
 block discarded – undo
1585 1585
 					if ($endjd === $startjd) {
1586 1586
 						$html .= I18N::translate('No events exist for tomorrow.');
1587 1587
 					} else {
1588
-						$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));
1588
+						$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));
1589 1589
 					}
1590 1590
 				} else {
1591 1591
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 				'<div class="noprint icons">' .
766 766
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
767 767
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
768
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
768
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
769 769
 				'</div>' .
770 770
 				'</div>' .
771 771
 				'</div>';
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 				'<div class="noprint icons">' .
818 818
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
819 819
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
820
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
820
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
821 821
 				'</div>' .
822 822
 				'</div>' .
823 823
 				'</div>';
Please login to merge, or discard this patch.
app/Controller/IndividualController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 
151 151
 		if ($n === 0) {
152 152
 			$content_class = 'collapse show';
153
-			$aria  = 'true';
153
+			$aria = 'true';
154 154
 
155 155
 			// Display gender icon
156 156
 			foreach ($individual->getFacts('SEX') as $sex_fact) {
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 		echo '<dd class="field">', $dummy->getFullName();
170 170
 		if ($this->record->canEdit() && !$name_fact->isPendingDeletion()) {
171 171
 			echo "<div class=\"deletelink noprint\"><a class=\"deleteicon\" href=\"#\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '" . $this->record->getXref() . "', '" . $name_fact->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>';
172
-			echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() .  '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
172
+			echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
173 173
 		}
174 174
 		echo '</dd>';
175 175
 		$ct = preg_match_all('/\n2 (\w+) (.*)/', $name_fact->getGedcom(), $nmatch, PREG_SET_ORDER);
Please login to merge, or discard this patch.
individual.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 if (Auth::isAdmin()) {
90 90
 	$user = User::findByGenealogyRecord($controller->record);
91 91
 	if ($user) {
92
-		$user_link =  ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
92
+		$user_link = ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
93 93
 	};
94 94
 }
95 95
 
Please login to merge, or discard this patch.
index_edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 			}
147 147
 		}
148 148
 	}
149
-	if ($user_id < 0 || $gedcom_id < 0 ) {
149
+	if ($user_id < 0 || $gedcom_id < 0) {
150 150
 		header('Location: ' . WT_BASE_URL . 'admin.php');
151 151
 	} elseif ($user_id > 0) {
152 152
 		header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl());
Please login to merge, or discard this patch.