@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | 'ged' => $tree->name(), |
| 146 | 146 | 'show_all' => 'yes', |
| 147 | 147 | ]; |
| 148 | - $show = $request->get('show', 'surn'); |
|
| 148 | + $show = $request->get('show', 'surn'); |
|
| 149 | 149 | } |
| 150 | 150 | } elseif ($surname) { |
| 151 | 151 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array |
| 521 | 521 | { |
| 522 | 522 | // All files in the folder, plus external files |
| 523 | - $sql = |
|
| 523 | + $sql = |
|
| 524 | 524 | "SELECT m_id AS xref, m_gedcom AS gedcom" . |
| 525 | 525 | " FROM `##media`" . |
| 526 | 526 | " JOIN `##media_file` USING (m_id, m_file)" . |
@@ -539,11 +539,11 @@ discard block |
||
| 539 | 539 | // Include / exclude subfolders (but always include external) |
| 540 | 540 | switch ($subfolders) { |
| 541 | 541 | case 'include': |
| 542 | - $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)"; |
|
| 542 | + $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)"; |
|
| 543 | 543 | $args[] = Database::escapeLike($folder); |
| 544 | 544 | break; |
| 545 | 545 | case 'exclude': |
| 546 | - $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)"; |
|
| 546 | + $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)"; |
|
| 547 | 547 | $args[] = Database::escapeLike($folder); |
| 548 | 548 | $args[] = Database::escapeLike($folder); |
| 549 | 549 | break; |
@@ -551,13 +551,13 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | // Apply search terms |
| 553 | 553 | if ($filter) { |
| 554 | - $sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))"; |
|
| 554 | + $sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))"; |
|
| 555 | 555 | $args[] = Database::escapeLike($filter); |
| 556 | 556 | $args[] = Database::escapeLike($filter); |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | if ($form_type) { |
| 560 | - $sql .= " AND source_media_type = ?"; |
|
| 560 | + $sql .= " AND source_media_type = ?"; |
|
| 561 | 561 | $args[] = $form_type; |
| 562 | 562 | } |
| 563 | 563 | |