@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) { |
| 77 | - return - (int) $match[1]; |
|
| 77 | + return -(int) $match[1]; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | return (int) $year; |
@@ -1793,7 +1793,7 @@ |
||
| 1793 | 1793 | public function menuSearchPhonetic(): Menu |
| 1794 | 1794 | { |
| 1795 | 1795 | /* I18N: search using “sounds like”, rather than exact spelling */ |
| 1796 | - return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
| 1796 | + return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
| 1797 | 1797 | } |
| 1798 | 1798 | |
| 1799 | 1799 | /** |
@@ -224,7 +224,7 @@ |
||
| 224 | 224 | public static function updateSchema($namespace, $schema_name, $target_version): bool |
| 225 | 225 | { |
| 226 | 226 | try { |
| 227 | - $current_version = (int)Site::getPreference($schema_name); |
|
| 227 | + $current_version = (int) Site::getPreference($schema_name); |
|
| 228 | 228 | } catch (PDOException $ex) { |
| 229 | 229 | DebugBar::addThrowable($ex); |
| 230 | 230 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | public function changesLogData(Request $request): Response |
| 232 | 232 | { |
| 233 | - list($select, , $where, $args1) = $this->changesQuery($request); |
|
| 233 | + list($select,, $where, $args1) = $this->changesQuery($request); |
|
| 234 | 234 | list($order_by, $limit, $args2) = $this->dataTablesPagination($request); |
| 235 | 235 | |
| 236 | 236 | $rows = Database::prepare( |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | */ |
| 307 | 307 | public function changesLogDownload(Request $request): Response |
| 308 | 308 | { |
| 309 | - list($select, , $where, $args) = $this->changesQuery($request); |
|
| 309 | + list($select,, $where, $args) = $this->changesQuery($request); |
|
| 310 | 310 | |
| 311 | 311 | $rows = Database::prepare($select . $where)->execute($args)->fetchAll(); |
| 312 | 312 | |
@@ -30,7 +30,8 @@ discard block |
||
| 30 | 30 | <?= /* I18N: %s is a version number */ |
| 31 | 31 | I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?> |
| 32 | 32 | </a> |
| 33 | - <?php else : ?> |
|
| 33 | + <?php else { |
|
| 34 | + : ?> |
|
| 34 | 35 | <?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?> |
| 35 | 36 | <?php endif ?> |
| 36 | 37 | </p> |
@@ -134,7 +135,9 @@ discard block |
||
| 134 | 135 | 'repositories' => $repositories, |
| 135 | 136 | 'media' => $media, |
| 136 | 137 | 'notes' => $notes, |
| 137 | - ]); ?> |
|
| 138 | + ]); |
|
| 139 | +} |
|
| 140 | +?> |
|
| 138 | 141 | </tbody> |
| 139 | 142 | <tfoot> |
| 140 | 143 | <tr> |
@@ -3,6 +3,8 @@ |
||
| 3 | 3 | |
| 4 | 4 | <?php if ($individual === null) : ?> |
| 5 | 5 | <?= FontAwesome::decorativeIcon($class) ?> |
| 6 | -<?php else : ?> |
|
| 6 | +<?php else { |
|
| 7 | + : ?> |
|
| 7 | 8 | <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])]) ?> |
| 8 | 9 | <?php endif; |
| 10 | +} |
|
@@ -319,8 +319,11 @@ |
||
| 319 | 319 | <?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?> |
| 320 | 320 | <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?> |
| 321 | 321 | <?php endif ?> |
| 322 | - <?php else : ?> |
|
| 323 | - <?php $age_at_death = ''; ?> |
|
| 322 | + <?php else { |
|
| 323 | + : ?> |
|
| 324 | + <?php $age_at_death = ''; |
|
| 325 | +} |
|
| 326 | +?> |
|
| 324 | 327 | <?php $age_at_death_sort = PHP_INT_MAX; ?> |
| 325 | 328 | <?php endif ?> |
| 326 | 329 | <td class="center" data-sort="<?= e($age_at_death_sort) ?>"> |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | <?php foreach ($tabs as $tab) : ?> |
| 108 | 108 | <div id="<?= $tab->getName() ?>" class="tab-pane fade wt-ajax-load" role="tabpanel"><?php if (!$tab->canLoadAjax()) : |
| 109 | 109 | ?><?= $tab->getTabContent($individual) ?><?php |
| 110 | - endif ?></div> |
|
| 110 | + endif ?></div> |
|
| 111 | 111 | <?php endforeach ?> |
| 112 | 112 | </div> |
| 113 | 113 | </div> |
@@ -45,7 +45,8 @@ discard block |
||
| 45 | 45 | <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> |
| 46 | 46 | <?php if ($m === $cal_month) : ?> |
| 47 | 47 | <span class="error"><?= e($month_name) ?></span> |
| 48 | - <?php else : ?> |
|
| 48 | + <?php else { |
|
| 49 | + : ?> |
|
| 49 | 50 | <?= e($month_name) ?> |
| 50 | 51 | <?php endif ?> |
| 51 | 52 | </a> | |
@@ -160,6 +161,7 @@ discard block |
||
| 160 | 161 | <td class="topbottombar width50"> |
| 161 | 162 | <?php |
| 162 | 163 | $n = 0; |
| 164 | +} |
|
| 163 | 165 | foreach (Date::calendarNames() as $newcal => $cal_name) { |
| 164 | 166 | $tmp = $cal_date->convertToCalendar($newcal); |
| 165 | 167 | if ($tmp->inValidRange()) { |