@@ -1577,7 +1577,7 @@ |
||
1577 | 1577 | public function menuSearchPhonetic(): Menu |
1578 | 1578 | { |
1579 | 1579 | /* I18N: search using “sounds like”, rather than exact spelling */ |
1580 | - return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1580 | + return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1581 | 1581 | } |
1582 | 1582 | |
1583 | 1583 | /** |
@@ -45,7 +45,8 @@ discard block |
||
45 | 45 | <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), '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()) { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | // Ambiguous dates - don't override calendar escape |
163 | 163 | if ($cal == '') { |
164 | 164 | if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) { |
165 | - $cal = GregorianDate::ESCAPE; |
|
165 | + $cal = GregorianDate::ESCAPE; |
|
166 | 166 | } else { |
167 | 167 | if (preg_match('/^[345]\d\d\d$/', $y)) { |
168 | 168 | // Year 3000-5999 |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | public function addYears(int $years, string $qualifier = ''): Date |
461 | 461 | { |
462 | 462 | $tmp = clone $this; |
463 | - $tmp->date1->year += $years; |
|
463 | + $tmp->date1->year += $years; |
|
464 | 464 | $tmp->date1->month = 0; |
465 | 465 | $tmp->date1->day = 0; |
466 | 466 | $tmp->date1->setJdFromYmd(); |