@@ -127,7 +127,6 @@ |
||
127 | 127 | /** |
128 | 128 | * Format a name record |
129 | 129 | * |
130 | - * @param int $primary |
|
131 | 130 | * @param Fact $name_fact |
132 | 131 | * |
133 | 132 | * @return string |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | |
151 | 151 | if ($n === 0) { |
152 | 152 | $content_class = 'collapse show'; |
153 | - $aria = 'true'; |
|
153 | + $aria = 'true'; |
|
154 | 154 | |
155 | 155 | // Display gender icon |
156 | 156 | foreach ($individual->getFacts('SEX') as $sex_fact) { |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | echo '<dd class="field">', $dummy->getFullName(); |
170 | 170 | if ($this->record->canEdit() && !$name_fact->isPendingDeletion()) { |
171 | 171 | echo "<div class=\"deletelink noprint\"><a class=\"deleteicon\" href=\"#\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '" . $this->record->getXref() . "', '" . $name_fact->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>'; |
172 | - echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $name_fact->getFactId() . '&ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>'; |
|
172 | + echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $name_fact->getFactId() . '&ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>'; |
|
173 | 173 | } |
174 | 174 | echo '</dd>'; |
175 | 175 | $ct = preg_match_all('/\n2 (\w+) (.*)/', $name_fact->getGedcom(), $nmatch, PREG_SET_ORDER); |
@@ -25,7 +25,6 @@ |
||
25 | 25 | use Fisharebest\Webtrees\Census\CensusOfUnitedStates; |
26 | 26 | use Fisharebest\Webtrees\Census\CensusOfWales; |
27 | 27 | use Fisharebest\Webtrees\Config; |
28 | -use Fisharebest\Webtrees\Database; |
|
29 | 28 | use Fisharebest\Webtrees\Date; |
30 | 29 | use Fisharebest\Webtrees\Fact; |
31 | 30 | use Fisharebest\Webtrees\Family; |
@@ -89,7 +89,7 @@ |
||
89 | 89 | if (Auth::isAdmin()) { |
90 | 90 | $user = User::findByGenealogyRecord($controller->record); |
91 | 91 | if ($user) { |
92 | - $user_link = ' — <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>'; |
|
92 | + $user_link = ' — <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>'; |
|
93 | 93 | }; |
94 | 94 | } |
95 | 95 |
@@ -146,7 +146,7 @@ |
||
146 | 146 | } |
147 | 147 | } |
148 | 148 | } |
149 | - if ($user_id < 0 || $gedcom_id < 0 ) { |
|
149 | + if ($user_id < 0 || $gedcom_id < 0) { |
|
150 | 150 | header('Location: ' . WT_BASE_URL . 'admin.php'); |
151 | 151 | } elseif ($user_id > 0) { |
152 | 152 | header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl()); |
@@ -47,7 +47,7 @@ |
||
47 | 47 | <?= I18N::translate('Individual') ?> |
48 | 48 | </label> |
49 | 49 | <div class="col-sm-9"> |
50 | - <?= FunctionsEdit::formControlIndividual( $controller->root, ['id' => 'rootid', 'name' => 'rootid']) ?> |
|
50 | + <?= FunctionsEdit::formControlIndividual($controller->root, ['id' => 'rootid', 'name' => 'rootid']) ?> |
|
51 | 51 | </div> |
52 | 52 | </div> |
53 | 53 |
@@ -15,8 +15,6 @@ |
||
15 | 15 | */ |
16 | 16 | namespace Fisharebest\Webtrees\Controller; |
17 | 17 | |
18 | -use Fisharebest\Webtrees\Database; |
|
19 | - |
|
20 | 18 | /** |
21 | 19 | * Base controller for all other controllers |
22 | 20 | */ |