Completed
Push — openstreetmap ( 37385e...885ddc )
by Greg
19:25 queued 11:20
created
app/Http/Controllers/FamilyBookChartController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@
 block discarded – undo
170 170
 				echo '<table cellspacing="0" cellpadding="0" border="0" >';
171 171
 				foreach ($children as $i => $child) {
172 172
 					echo '<tr><td>';
173
-					$kids    = $this->printDescendency($child, $generation + 1);
173
+					$kids = $this->printDescendency($child, $generation + 1);
174 174
 					$numkids += $kids;
175 175
 					echo '</td>';
176 176
 					// Print the lines
Please login to merge, or discard this patch.
app/Module/InteractiveTreeModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@
 block discarded – undo
161 161
 	 * @return Response
162 162
 	 */
163 163
 	public function getPersonsAction(Request $request): Response {
164
-		$q  = $request->get('q');
164
+		$q = $request->get('q');
165 165
 		$instance = $request->get('instance');
166 166
 		$treeview = new TreeView($instance);
167 167
 
Please login to merge, or discard this patch.
resources/views/admin/trees.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 				</div>
30 30
 				<div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>">
31 31
 					<div class="card-body">
32
-						<?php $importing = Database::prepare( "SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?>
32
+						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?>
33 33
 						<?php if ($importing): ?>
34 34
 							<div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12">
35 35
 								<div class="progress">
Please login to merge, or discard this patch.
app/Http/Controllers/ErrorController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 			return new RedirectResponse(route('admin-trees'));
59 59
 		}
60 60
 
61
-		return $this->viewResponse('errors/no-tree-access', [ 'title' => '' ]);
61
+		return $this->viewResponse('errors/no-tree-access', ['title' => '']);
62 62
 	}
63 63
 
64 64
 	/**
Please login to merge, or discard this patch.
app/Http/Controllers/AdminUsersController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 		$args = [];
170 170
 
171 171
 		if ($search) {
172
-			$sql_select       .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
172
+			$sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
173 173
 			$args['search_1'] = $search;
174 174
 			$args['search_2'] = $search;
175 175
 			$args['search_3'] = $search;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 
199 199
 		if ($length) {
200 200
 			$user->setPreference('admin_users_page_size', $length);
201
-			$sql_select     .= " LIMIT :limit OFFSET :offset";
201
+			$sql_select .= " LIMIT :limit OFFSET :offset";
202 202
 			$args['limit']  = $length;
203 203
 			$args['offset'] = $start;
204 204
 		}
Please login to merge, or discard this patch.
resources/views/admin/media.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 <br>
78 78
 <br>
79 79
 
80
-<table class="table table-bordered table-sm" id="media-table-<?= e($table_id) ?>" data-ajax="<?= e(route('admin-media-data', ['files' => $files, 'media_folder' => $media_folder, 'media_path' => $media_path, 'subfolders' => $subfolders ])) ?>">
80
+<table class="table table-bordered table-sm" id="media-table-<?= e($table_id) ?>" data-ajax="<?= e(route('admin-media-data', ['files' => $files, 'media_folder' => $media_folder, 'media_path' => $media_path, 'subfolders' => $subfolders])) ?>">
81 81
 	<thead>
82 82
 		<tr>
83 83
 			<th><?= I18N::translate('Media file') ?></th>
Please login to merge, or discard this patch.
app/Http/Controllers/AdminMediaController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 					"  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
153 153
 					" AND   multimedia_file_refn NOT LIKE 'http://%'" .
154 154
 					" AND   multimedia_file_refn NOT LIKE 'https://%'";
155
-				$ARGS1   = [
155
+				$ARGS1 = [
156 156
 					'media_path_1' => $media_path,
157 157
 					'media_folder' => $media_folder,
158 158
 					'media_path_2' => Database::escapeLike($media_path),
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 					" AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
170 170
 					" AND   multimedia_file_refn NOT LIKE 'http://%'" .
171 171
 					" AND   multimedia_file_refn NOT LIKE 'https://%'";
172
-				$ARGS2   = [
172
+				$ARGS2 = [
173 173
 					'media_folder' => $media_folder,
174 174
 					'media_path_3' => $media_path,
175 175
 				];
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 					$ARGS2['media_path_4'] = Database::escapeLike($media_path);
182 182
 				}
183 183
 
184
-				$order   = $request->get('order', []);
184
+				$order = $request->get('order', []);
185 185
 				$SELECT1 .= " ORDER BY ";
186 186
 				if ($order) {
187 187
 					foreach ($order as $key => $value) {
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 				}
206 206
 
207 207
 				if ($length > 0) {
208
-					$SELECT1         .= " LIMIT :length OFFSET :start";
208
+					$SELECT1 .= " LIMIT :length OFFSET :start";
209 209
 					$ARGS1['length'] = $length;
210 210
 					$ARGS1['start']  = $start;
211 211
 				}
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 					" JOIN  `##media_file` USING (m_id, m_file)" .
239 239
 					" WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
240 240
 					" AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
241
-				$ARGS1   = [
241
+				$ARGS1 = [
242 242
 					'search_1' => Database::escapeLike($search),
243 243
 					'search_2' => Database::escapeLike($search),
244 244
 				];
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 				}
275 275
 
276 276
 				if ($length > 0) {
277
-					$SELECT1         .= " LIMIT :length OFFSET :start";
277
+					$SELECT1 .= " LIMIT :length OFFSET :start";
278 278
 					$ARGS1['length'] = $length;
279 279
 					$ARGS1['start']  = $start;
280 280
 				}
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/RegisterController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@
 block discarded – undo
193 193
 
194 194
 		// Username already exists
195 195
 		if (User::findByUserName($username) !== null) {
196
-			throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'.$username));
196
+			throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.' . $username));
197 197
 		}
198 198
 
199 199
 		// Email already exists
Please login to merge, or discard this patch.
app/Http/Controllers/AdminTreesController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -975,8 +975,8 @@
 block discarded – undo
975 975
 		// For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
976 976
 		// e.g. "gregorian_and_jewish"
977 977
 		$tree->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique([
978
-			$request->get('CALENDAR_FORMAT0',  'none'),
979
-			$request->get('CALENDAR_FORMAT1',  'none'),
978
+			$request->get('CALENDAR_FORMAT0', 'none'),
979
+			$request->get('CALENDAR_FORMAT1', 'none'),
980 980
 		])));
981 981
 		$tree->setPreference('CHART_BOX_TAGS', implode(',', $request->get('CHART_BOX_TAGS', [])));
982 982
 		$tree->setPreference('CONTACT_USER_ID', $request->get('CONTACT_USER_ID'));
Please login to merge, or discard this patch.