Completed
Push — openstreetmap ( c02ae5...190f01 )
by Greg
17:40 queued 08:16
created
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/AdminTreesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@
 block discarded – undo
192 192
 				$download_filename . '.zip'
193 193
 			);
194 194
 		} else {
195
-			$response = new StreamedResponse(function() use ($tree, $exportOptions) {
195
+			$response = new StreamedResponse(function () use ($tree, $exportOptions) {
196 196
 				$stream = fopen('php://output', 'w');
197 197
 				FunctionsExport::exportGedcom($tree, $stream, $exportOptions);
198 198
 				fclose($stream);
Please login to merge, or discard this patch.