@@ -28,8 +28,6 @@ |
||
28 | 28 | use Fisharebest\Webtrees\Html; |
29 | 29 | use Fisharebest\Webtrees\I18N; |
30 | 30 | use Fisharebest\Webtrees\Individual; |
31 | -use Fisharebest\Webtrees\Module; |
|
32 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
33 | 31 | use Fisharebest\Webtrees\Note; |
34 | 32 | use Fisharebest\Webtrees\Place; |
35 | 33 | use Fisharebest\Webtrees\Session; |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Fisharebest\Webtrees\Functions\FunctionsPrint; |
20 | 20 | use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; |
21 | 21 | use Fisharebest\Webtrees\Functions\FunctionsPrintLists; |
22 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
23 | 22 | |
24 | 23 | /** @global Tree $WT_TREE */ |
25 | 24 | global $WT_TREE; |
@@ -23,8 +23,8 @@ |
||
23 | 23 | use League\Flysystem\Filesystem; |
24 | 24 | use League\Glide\Filesystem\FileNotFoundException; |
25 | 25 | use League\Glide\ServerFactory; |
26 | -use League\Glide\Signatures\SignatureFactory; |
|
27 | 26 | use League\Glide\Signatures\SignatureException; |
27 | +use League\Glide\Signatures\SignatureFactory; |
|
28 | 28 | |
29 | 29 | /** @global Tree $WT_TREE */ |
30 | 30 | global $WT_TREE; |
@@ -68,7 +68,7 @@ |
||
68 | 68 | // Caution - $media_dir may contain relative paths: ../../ |
69 | 69 | $source_dir = new Filesystem(new Local(WT_DATA_DIR . $media_dir)); |
70 | 70 | $cache_dir = new Filesystem(new Local(WT_DATA_DIR . 'thumbnail-cache/' . md5($media_dir))); |
71 | - $assets_dir = new Filesystem(new Local( 'assets')); |
|
71 | + $assets_dir = new Filesystem(new Local('assets')); |
|
72 | 72 | |
73 | 73 | $server = ServerFactory::create([ |
74 | 74 | 'driver' => $driver, |
@@ -37,7 +37,7 @@ |
||
37 | 37 | /** |
38 | 38 | * Returns a list of block parsers to add to the existing list |
39 | 39 | * |
40 | - * @return BlockParserInterface[] |
|
40 | + * @return CensusTableParser[] |
|
41 | 41 | */ |
42 | 42 | public function getBlockParsers() { |
43 | 43 | return [ |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use League\CommonMark\Block\Parser\AbstractBlockParser; |
20 | 20 | use League\CommonMark\ContextInterface; |
21 | 21 | use League\CommonMark\Cursor; |
22 | -use League\CommonMark\Util\RegexHelper; |
|
23 | 22 | use Webuni\CommonMark\TableExtension\Table; |
24 | 23 | use Webuni\CommonMark\TableExtension\TableCell; |
25 | 24 | use Webuni\CommonMark\TableExtension\TableRow; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
38 | - * @return array |
|
38 | + * @return XrefParser[] |
|
39 | 39 | */ |
40 | 40 | public function getInlineParsers() { |
41 | 41 | return [ |
@@ -38,7 +38,7 @@ |
||
38 | 38 | /** |
39 | 39 | * We are only interested in text that begins with '@'. |
40 | 40 | * |
41 | - * @return array |
|
41 | + * @return string[] |
|
42 | 42 | */ |
43 | 43 | public function getCharacters() { |
44 | 44 | return ['@']; |
@@ -17,9 +17,9 @@ |
||
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\GedcomRecord; |
19 | 19 | use Fisharebest\Webtrees\Tree; |
20 | +use League\CommonMark\InlineParserContext; |
|
20 | 21 | use League\CommonMark\Inline\Element\Link; |
21 | 22 | use League\CommonMark\Inline\Parser\AbstractInlineParser; |
22 | -use League\CommonMark\InlineParserContext; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Convert XREFs within markdown text to links |
@@ -47,7 +47,7 @@ |
||
47 | 47 | |
48 | 48 | switch ($action) { |
49 | 49 | case 'delete': |
50 | - Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id,]); |
|
50 | + Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id, ]); |
|
51 | 51 | |
52 | 52 | header('Location: index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl()); |
53 | 53 |
@@ -82,7 +82,8 @@ discard block |
||
82 | 82 | <?php if ($ancestors_only === '1'): ?> |
83 | 83 | <input type="hidden" name="ancestors" value="1"> |
84 | 84 | <?= I18N::translate('Find relationships via ancestors') ?> |
85 | - <?php else: ?> |
|
85 | + <?php else { |
|
86 | + : ?> |
|
86 | 87 | <?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?> |
87 | 88 | <?php endif ?> |
88 | 89 | </div> |
@@ -116,6 +117,7 @@ discard block |
||
116 | 117 | if ($person1 && $person2) { |
117 | 118 | if (I18N::direction() === 'ltr') { |
118 | 119 | $diagonal1 = Theme::theme()->parameter('image-dline'); |
120 | +} |
|
119 | 121 | $diagonal2 = Theme::theme()->parameter('image-dline2'); |
120 | 122 | } else { |
121 | 123 | $diagonal1 = Theme::theme()->parameter('image-dline2'); |