@@ -35,7 +35,6 @@ |
||
35 | 35 | use Fisharebest\Webtrees\Menu; |
36 | 36 | use Fisharebest\Webtrees\Module; |
37 | 37 | use Fisharebest\Webtrees\Stats; |
38 | -use Fisharebest\Webtrees\Theme; |
|
39 | 38 | use Fisharebest\Webtrees\Tree; |
40 | 39 | use PDO; |
41 | 40 |
@@ -57,14 +57,14 @@ |
||
57 | 57 | 'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH', |
58 | 58 | 'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV', |
59 | 59 | 'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC', |
60 | - 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
61 | - 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
60 | + 'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE', |
|
61 | + 'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO', |
|
62 | 62 | 'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA', |
63 | - 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
64 | - 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA', |
|
63 | + 'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL', |
|
64 | + 'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA', |
|
65 | 65 | 'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI', |
66 | - 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
67 | - 'VILLA', 'WASHI', 'WINTE', |
|
66 | + 'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA', |
|
67 | + 'VILLA', 'WASHI', 'WINTE', |
|
68 | 68 | ); |
69 | 69 | } |
70 | 70 |
@@ -139,8 +139,11 @@ discard block |
||
139 | 139 | <div class="font9"> |
140 | 140 | <?php echo $spouse->getLifeSpan(); ?> |
141 | 141 | </div> |
142 | - <?php else: ?> |
|
143 | - <?php echo $spouse->getFullName(); ?> |
|
142 | + <?php else { |
|
143 | + : ?> |
|
144 | + <?php echo $spouse->getFullName(); |
|
145 | +} |
|
146 | +?> |
|
144 | 147 | <?php endif; ?> |
145 | 148 | </td> |
146 | 149 | </tr> |
@@ -164,8 +167,11 @@ discard block |
||
164 | 167 | <div class="font9"> |
165 | 168 | <?php echo $child->getLifeSpan(); ?> |
166 | 169 | </div> |
167 | - <?php else: ?> |
|
168 | - <?php echo $child->getFullName(); ?> |
|
170 | + <?php else { |
|
171 | + : ?> |
|
172 | + <?php echo $child->getFullName(); |
|
173 | +} |
|
174 | +?> |
|
169 | 175 | <?php endif; ?> |
170 | 176 | </td> |
171 | 177 | </tr> |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Get the male (or first female) partner of the family |
103 | 103 | * |
104 | - * @param $access_level int|null |
|
104 | + * @param integer $access_level int|null |
|
105 | 105 | * |
106 | 106 | * @return Individual|null |
107 | 107 | */ |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Get the female (or second male) partner of the family |
120 | 120 | * |
121 | - * @param $access_level int|null |
|
121 | + * @param integer $access_level int|null |
|
122 | 122 | * |
123 | 123 | * @return Individual|null |
124 | 124 | */ |
@@ -388,7 +388,7 @@ |
||
388 | 388 | * (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N" |
389 | 389 | * (c) Level 2 or higher object with the Highlight option set to "Y" |
390 | 390 | * |
391 | - * @return null|Media |
|
391 | + * @return GedcomRecord|null |
|
392 | 392 | */ |
393 | 393 | public function findHighlightedMedia() { |
394 | 394 | $objectA = null; |
@@ -142,7 +142,7 @@ |
||
142 | 142 | * |
143 | 143 | * @param int $fetch_style |
144 | 144 | * |
145 | - * @return \stdClass|array|null |
|
145 | + * @return \stdClass |
|
146 | 146 | */ |
147 | 147 | public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) { |
148 | 148 | if (!$this->executed) { |