Completed
Pull Request — master (#1461)
by Rico
07:40
created
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1717,7 +1717,7 @@
 block discarded – undo
1717 1717
 					if ($endjd === $startjd) {
1718 1718
 						$html .= I18N::translate('No events exist for tomorrow.');
1719 1719
 					} else {
1720
-						$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));
1720
+						$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));
1721 1721
 					}
1722 1722
 				} else {
1723 1723
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
admin_users.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -770,13 +770,15 @@
 block discarded – undo
770 770
 		<p>
771 771
 		<?php if ($ucnt): ?>
772 772
 			<input type="submit" value="<?= I18N::translate('delete') ?>">
773
-			<?php else: ?>
773
+			<?php else {
774
+	: ?>
774 775
 			<?= I18N::translate('Nothing found to cleanup') ?>
775 776
 			<?php endif ?>
776 777
 		</p>
777 778
 	</form>
778 779
 	<?php
779 780
 	break;
781
+}
780 782
 
781 783
 case 'cleanup2':
782 784
 	foreach (User::all() as $user) {
Please login to merge, or discard this patch.
app/Module/BatchUpdateModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,8 @@  discard block
 block discarded – undo
235 235
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
236 236
 					<?php // page, which makes them all again!  ?>
237 237
 					<script>reset_reload();</script>
238
-			<?php else: ?>
238
+			<?php else {
239
+	: ?>
239 240
 					<hr>
240 241
 					<div id="batch_update2" class="col-sm-12">
241 242
 						<?php if ($this->curr_xref): ?>
@@ -273,6 +274,7 @@  discard block
 block discarded – undo
273 274
 		foreach (array_keys($this->all_xrefs) as $key) {
274 275
 			if ($key > $xref) {
275 276
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
277
+}
276 278
 				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
277 279
 					return $key;
278 280
 				}
Please login to merge, or discard this patch.
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
 			[
Please login to merge, or discard this patch.
app/Module/StoriesModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -381,7 +381,8 @@  discard block
 block discarded – undo
381 381
 						<a href="<?= $individual->getHtmlUrl() ?>#tab-stories">
382 382
 							<?= $individual->getFullName() ?>
383 383
 						</a>
384
-						<?php else: ?>
384
+						<?php else {
385
+	: ?>
385 386
 							<?= $story->xref ?>
386 387
 						<?php endif ?>
387 388
 						</td>
@@ -410,6 +411,7 @@  discard block
 block discarded – undo
410 411
 	 */
411 412
 	private function showList() {
412 413
 		global $controller, $WT_TREE;
414
+}
413 415
 
414 416
 		$controller = new PageController;
415 417
 		$controller
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.
placelist.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,8 @@  discard block
 block discarded – undo
200 200
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
201 201
 				<?php if (empty($myindilist)): ?>
202 202
 					<p><?= I18N::translate('No results found.') ?></p>
203
-				<?php else: ?>
203
+				<?php else {
204
+	: ?>
204 205
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
205 206
 				<?php endif ?>
206 207
 			</div>
@@ -216,6 +217,7 @@  discard block
 block discarded – undo
216 217
 		<?php
217 218
 	}
218 219
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
220
+}
219 221
 
220 222
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
221 223
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
Please login to merge, or discard this patch.
admin_trees_config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1505,7 +1505,7 @@
 block discarded – undo
1505 1505
 						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
1506 1506
 						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
1507 1507
 					], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
1508
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1508
+					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1509 1509
 				) ?>
1510 1510
 				<p class="small text-muted">
1511 1511
 					<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>
Please login to merge, or discard this patch.
app/Census/CensusColumnAgeFemale5Years.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 				$years -= $years % 5;
41 41
 			}
42 42
 
43
-			return (string)$years;
43
+			return (string) $years;
44 44
 		}
45 45
 	}
46 46
 }
Please login to merge, or discard this patch.