@@ -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'); |
@@ -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, |
@@ -22,8 +22,8 @@ |
||
22 | 22 | use League\Flysystem\Filesystem; |
23 | 23 | use League\Glide\Filesystem\FileNotFoundException; |
24 | 24 | use League\Glide\ServerFactory; |
25 | -use League\Glide\Signatures\SignatureFactory; |
|
26 | 25 | use League\Glide\Signatures\SignatureException; |
26 | +use League\Glide\Signatures\SignatureFactory; |
|
27 | 27 | use Throwable; |
28 | 28 | |
29 | 29 | /** @global Tree $WT_TREE */ |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * You should have received a copy of the GNU General Public License |
14 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | 15 | */ |
16 | -declare(strict_types=1); |
|
16 | +declare(strict_types = 1); |
|
17 | 17 | |
18 | 18 | namespace Fisharebest\Webtrees; |
19 | 19 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * You should have received a copy of the GNU General Public License |
14 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | 15 | */ |
16 | -declare(strict_types=1); |
|
16 | +declare(strict_types = 1); |
|
17 | 17 | |
18 | 18 | namespace Fisharebest\Webtrees; |
19 | 19 |
@@ -168,7 +168,7 @@ |
||
168 | 168 | DebugBar::addThrowable($ex); |
169 | 169 | |
170 | 170 | // The module has been deleted or is broken? Disable it. |
171 | - Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage()); |
|
171 | + Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage()); |
|
172 | 172 | Database::prepare( |
173 | 173 | "UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name" |
174 | 174 | )->execute([ |
@@ -78,8 +78,7 @@ |
||
78 | 78 | // Create the underlying PDO object |
79 | 79 | self::$pdo = new PDO( |
80 | 80 | (substr($config['dbhost'], 0, 1) === '/' ? |
81 | - "mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : |
|
82 | - "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}" |
|
81 | + "mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}" |
|
83 | 82 | ), |
84 | 83 | $config['dbuser'], $config['dbpass'], |
85 | 84 | [ |
@@ -15,10 +15,7 @@ |
||
15 | 15 | */ |
16 | 16 | namespace Fisharebest\Webtrees\Controller; |
17 | 17 | |
18 | -use Fisharebest\Webtrees\Theme; |
|
19 | 18 | use Fisharebest\Webtrees\Tree; |
20 | -use Fisharebest\Webtrees\View; |
|
21 | -use Symfony\Component\HttpFoundation\Response; |
|
22 | 19 | |
23 | 20 | /** |
24 | 21 | * Base controller for all other controllers |