fisharebest / webtrees

app/Module/InteractiveTreeModule.php

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$q  = $request->get('q');
+		$q = $request->get('q');
 		$instance = $request->get('instance');
 		$treeview = new TreeView($instance);
 

app/Module.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 					DebugBar::addThrowable($ex);
 
 					// The module has been deleted or is broken? Disable it.
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage(), null);
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage(), null);
 					Database::prepare(
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
 					)->execute([

app/I18N.php

Indentation +2 added lines, -2 removed lines

@@ -322,8 +322,8 @@
 				$default_locale = new LocaleEnUs;
 				try {
 					// @TODO, when no language is requested by the user (e.g. search engines), we should use
-	        // the tree's default language.  However, we currently initialise languages before trees,
-	        //  so there is no tree available for us to use.
+					// the tree's default language.  However, we currently initialise languages before trees,
+					//  so there is no tree available for us to use.
 				} catch (\Exception $ex) {
 					DebugBar::addThrowable($ex);
 				}

resources/views/edit/edit-fact.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 						'level'          => 2,
 						'full_citations' => $tree->getPreference('FULL_SOURCES'),
 						'tree'           => $tree,
-					]);				}
+					]); }
 				if ($level1type !== 'OBJE') {
 					if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
 						echo view('cards/add-media-object', [

app/Functions/FunctionsPrintFacts.php

Spacing +1 added lines, -1 removed lines

@@ -763,7 +763,7 @@
 						// Inline sources can't be edited. Attempting to save one will convert it
 						// into a link, and delete it.
 						// e.g. "1 SOUR my source" becomes "1 SOUR @my source@" which does not exist.
-						echo FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-fact', ['xref' => $parent->getXref(),  'fact_id' => $fact->getFactId(), 'ged' => $tree->getName()])]);
+						echo FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-fact', ['xref' => $parent->getXref(), 'fact_id' => $fact->getFactId(), 'ged' => $tree->getName()])]);
 						echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");']);
 					}
 					echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");']);

app/Http/Controllers/AbstractEditController.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 			// The sub-records should be deleted.
 			if ($this->tag[$j] === 'SOUR' && ($this->text[$j] === '@@' || $this->text[$j] === '')) {
 				$this->text[$j] = '';
-				$k        = $j + 1;
+				$k = $j + 1;
 				while (($k < count($this->glevels)) && ($this->glevels[$k] > $this->glevels[$j])) {
 					$this->text[$k] = '';
 					$k++;

app/Http/Controllers/SearchController.php

Spacing +39 added lines, -39 removed lines

@@ -596,7 +596,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -643,7 +643,7 @@ 
 	 * @return Family[]
 	 */
 	private function searchFamilyNames(array $search_terms, array $search_trees): array {
-		$sql  =
+		$sql =
 			"SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
 			" FROM `##families`" .
 			" LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -652,7 +652,7 @@ 
 		$args = [];
 
 		foreach ($search_terms as $n => $q) {
-			$sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+			$sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
 			$args['husb_collate_' . $n] = I18N::collation();
 			$args['husb_query_' . $n]   = Database::escapeLike($q);
 			$args['wife_collate_' . $n] = I18N::collation();
@@ -703,7 +703,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -849,7 +849,7 @@ 
 		}
 
 		// Add the where clause
-		$sql    .= " WHERE ind.i_file=?";
+		$sql .= " WHERE ind.i_file=?";
 		$bind[] = $tree->getTreeId();
 
 		foreach ($fields as $field_name => $field_value) {
@@ -860,15 +860,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_givn=?";
+								$sql .= " AND i_n.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -882,7 +882,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -898,7 +898,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -907,15 +907,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_surname=?";
+								$sql .= " AND i_n.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -929,7 +929,7 @@ 
 									$sql .= " AND (" . implode(' OR ', $sdx) . ")";
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -946,7 +946,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -955,7 +955,7 @@ 
 					case '_MARNM':
 					case '_HEB':
 					case '_AKA':
-						$sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+						$sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
 						$bind[] = $parts[1];
 						$bind[] = $field_value;
 						break;
@@ -965,7 +965,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * ($modifiers[$field_name] ?? 0);
-					$sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+					$sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
 					$bind[] = $parts[0];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -975,7 +975,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * $modifiers[$field_name];
-					$sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+					$sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
 					$bind[] = $parts[1];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -983,12 +983,12 @@ 
 			} elseif ($parts[1] === 'PLAC') {
 				// *:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
 				// FAMS:*:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
 				$table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -997,15 +997,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_givn=?";
+								$sql .= " AND {$table}.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1019,7 +1019,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1036,7 +1036,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -1044,15 +1044,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_surname=?";
+								$sql .= " AND {$table}.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1066,7 +1066,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1082,7 +1082,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1091,17 +1091,17 @@ 
 				}
 			} elseif ($parts[0] === 'FAMS') {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[1];
 				$bind[] = $field_value;
 			} elseif ($parts[1] === 'TYPE') {
 				// e.g. FACT:TYPE or EVEN:TYPE
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			} else {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			}
@@ -1179,7 +1179,7 @@ 
 		$sql .= ")";
 
 		if ($givn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$givn_sdx = explode(':', $givn_sdx);
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n > 0 ? " OR " : "";
@@ -1197,7 +1197,7 @@ 
 		}
 
 		if ($surn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$surn_sdx = explode(':', $surn_sdx);
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1215,7 +1215,7 @@ 
 		}
 
 		if ($plac_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$plac_sdx = explode(':', $plac_sdx);
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1261,7 +1261,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1316,7 +1316,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1371,7 +1371,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}

app/Http/Controllers/ListController.php

Spacing +12 added lines, -12 removed lines

@@ -286,7 +286,7 @@ 
 					}
 					// Don't sublists short lists.
 					if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
-						$falpha              = '';
+						$falpha = '';
 					} else {
 						$givn_initials = $this->givenAlpha($tree, $surname, $alpha, $show_marnm === 'yes', $families);
 						// Break long lists by initial letter of given name
@@ -513,7 +513,7 @@ 
 	 */
 	private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array {
 		// All files in the folder, plus external files
-		$sql  =
+		$sql =
 			"SELECT m_id AS xref, m_gedcom AS gedcom" .
 			" FROM `##media`" .
 			" JOIN `##media_file` USING (m_id, m_file)" .
@@ -532,11 +532,11 @@ 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
 			case 'include':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				break;
 			case 'exclude':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				$args[] = Database::escapeLike($folder);
 				break;
@@ -544,13 +544,13 @@ 
 
 		// Apply search terms
 		if ($filter) {
-			$sql    .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
+			$sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
 			$args[] = Database::escapeLike($filter);
 			$args[] = Database::escapeLike($filter);
 		}
 
 		if ($form_type) {
-			$sql    .= " AND source_media_type = ?";
+			$sql .= " AND source_media_type = ?";
 			$args[] = $form_type;
 		}
 
@@ -1463,7 +1463,7 @@ 
 		];
 
 		foreach ($this->getAlphabetForLocale(WT_LOCALE) as $n => $letter) {
-			$sql                   .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
+			$sql .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
 			$args['collate_' . $n] = I18N::collation();
 			$args['letter_' . $n]  = $letter . '%';
 		}
@@ -1549,7 +1549,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1601,7 +1601,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1614,7 +1614,7 @@ 
 			// All surnames
 			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
 		}
-		$sql               .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
+		$sql .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 
@@ -1655,7 +1655,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1672,7 +1672,7 @@ 
 			$sql .= " AND " . $this->getInitialSql('n_givn', $galpha);
 		}
 
-		$sql               .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
+		$sql .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 

app/Functions/FunctionsEdit.php

Spacing +1 added lines, -1 removed lines

@@ -933,7 +933,7 @@
 			}
 
 			if ($type !== 'CONT') {
-				self::$tags[]    = $type;
+				self::$tags[] = $type;
 				$subrecord = $level . ' ' . $type . ' ' . $text;
 				if ($inSource && $type === 'DATE') {
 					echo self::addSimpleTag($tree, $subrecord, '', GedcomTag::getLabel($label, $record));