Completed
Push — develop ( 867d3f...4a4f9c )
by Greg
15:10
created
app/Module/LoggedInUsersModule.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,6 @@
 block discarded – undo
17 17
 
18 18
 use Fisharebest\Webtrees\Auth;
19 19
 use Fisharebest\Webtrees\Filter;
20
-use Fisharebest\Webtrees\Functions\Functions;
21 20
 use Fisharebest\Webtrees\I18N;
22 21
 use Fisharebest\Webtrees\Individual;
23 22
 use Fisharebest\Webtrees\Theme;
Please login to merge, or discard this patch.
app/Module/UserMessagesModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 					$message->subject = I18N::translate('RE: ') . $message->subject;
128 128
 				}
129 129
 				if ($user) {
130
-					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() .'" title="' . I18N::translate('Reply') .'">' . I18N::translate('Reply') . '</a> ';
130
+					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
131 131
 				}
132 132
 				$content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
133 133
 			}
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -90,9 +90,9 @@
 block discarded – undo
90 90
 		'info'    => 'fa fa-info-circle',
91 91
 		'warning' => 'fa fa-exclamation-circle',
92 92
 
93
-	  // Icons for file types
94
-	  'mime-application-pdf' => '',
95
-	  'mime-text-html'       => '',
93
+		// Icons for file types
94
+		'mime-application-pdf' => '',
95
+		'mime-text-html'       => '',
96 96
 
97 97
 		// Other icons
98 98
 		'mail'    => 'fa fa-envelope-o',
Please login to merge, or discard this patch.
message.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,8 @@  discard block
 block discarded – undo
109 109
 						</option>
110 110
 					</select>
111 111
 				</td>
112
-				<?php else: ?>
112
+				<?php else {
113
+	: ?>
113 114
 					<td class="descriptionbox wrap"></td>
114 115
 					<td class="optionbox wrap"></td>
115 116
 				<?php endif ?>
@@ -133,6 +134,7 @@  discard block
 block discarded – undo
133 134
 						<?php
134 135
 						foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) {
135 136
 							echo '<option value="', $selectEntry, '" ';
137
+}
136 138
 							if ($selectEntry == $max) {
137 139
 								echo 'selected';
138 140
 							}
Please login to merge, or discard this patch.