diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-03-08 17:09:41 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-03-09 00:08:53 +0000 |
| commit | 24ec66ce7e77188cd2495b0f8d4dd0ae6e8c9c52 (patch) | |
| tree | 0059c30afd4b78da23f28067165a7b17415924d8 /app/Query | |
| parent | 3763c3f2dff6a4360b7b8810b6250e372dded805 (diff) | |
| download | webtrees-24ec66ce7e77188cd2495b0f8d4dd0ae6e8c9c52.tar.gz webtrees-24ec66ce7e77188cd2495b0f8d4dd0ae6e8c9c52.tar.bz2 webtrees-24ec66ce7e77188cd2495b0f8d4dd0ae6e8c9c52.zip | |
Use Tree object instead of ID/name
Diffstat (limited to 'app/Query')
| -rw-r--r-- | app/Query/QueryMedia.php | 12 | ||||
| -rw-r--r-- | app/Query/QueryName.php | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/Query/QueryMedia.php b/app/Query/QueryMedia.php index 3bf4b1bee6..b449ba6672 100644 --- a/app/Query/QueryMedia.php +++ b/app/Query/QueryMedia.php @@ -30,6 +30,8 @@ class QueryMedia { * @return string[] */ public static function folderList() { + global $WT_TREE; + $folders = Database::prepare( "SELECT SQL_CACHE LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" . " FROM `##media`" . @@ -38,7 +40,7 @@ class QueryMedia { " AND m_filename NOT LIKE 'https://%'" . " GROUP BY 1" . " ORDER BY 1" - )->execute(array(WT_GED_ID))->fetchOneColumn(); + )->execute(array($WT_TREE->getTreeId()))->fetchOneColumn(); if (!$folders || reset($folders) != '') { array_unshift($folders, ''); @@ -81,13 +83,15 @@ class QueryMedia { * @throws \Exception */ public static function mediaList($folder, $subfolders, $sort, $filter) { + global $WT_TREE; + // All files in the folder, plus external files $sql = - "SELECT m_id AS xref, m_file AS gedcom_id, m_gedcom AS gedcom" . + "SELECT m_id AS xref, m_gedcom AS gedcom" . " FROM `##media`" . " WHERE m_file=?"; $args = array( - WT_GED_ID, + $WT_TREE->getTreeId(), ); // Only show external files when we are looking at the root folder @@ -133,7 +137,7 @@ class QueryMedia { $rows = Database::prepare($sql)->execute($args)->fetchAll(); $list = array(); foreach ($rows as $row) { - $media = Media::getInstance($row->xref, $row->gedcom_id, $row->gedcom); + $media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom); if ($media->canShow()) { $list[] = $media; } diff --git a/app/Query/QueryName.php b/app/Query/QueryName.php index 16bb50f562..74ba7cfe00 100644 --- a/app/Query/QueryName.php +++ b/app/Query/QueryName.php @@ -449,8 +449,9 @@ class QueryName { * @return Individual[] */ public static function individuals($surn, $salpha, $galpha, $marnm, $fams, $ged_id) { + $tree = Tree::findById($ged_id); $sql = - "SELECT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full " . + "SELECT i_id AS xref, i_gedcom AS gedcom, n_full " . "FROM `##individuals` " . "JOIN `##name` ON n_id = i_id AND n_file = i_file " . ($fams ? "JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") . @@ -486,7 +487,7 @@ class QueryName { $list = array(); $rows = Database::prepare($sql)->execute($args)->fetchAll(); foreach ($rows as $row) { - $person = Individual::getInstance($row->xref, $row->gedcom_id, $row->gedcom); + $person = Individual::getInstance($row->xref, $tree, $row->gedcom); // The name from the database may be private - check the filtered list... foreach ($person->getAllNames() as $n=>$name) { if ($name['fullNN'] == $row->n_full) { |