diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-08-30 13:41:53 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-08-30 13:41:53 +0000 |
| commit | ebdb4ef1d414edf847b3f363fd97b8aa20153987 (patch) | |
| tree | d9e2c1a3d62f441d2ba8b5128aeddbc4a6dce26f /includes/functions/functions_db.php | |
| parent | c10ea5204502889ad2939441c38b624f355fd334 (diff) | |
| download | webtrees-ebdb4ef1d414edf847b3f363fd97b8aa20153987.tar.gz webtrees-ebdb4ef1d414edf847b3f363fd97b8aa20153987.tar.bz2 webtrees-ebdb4ef1d414edf847b3f363fd97b8aa20153987.zip | |
Add more collation specifiers, for proper I18N sorting
Diffstat (limited to 'includes/functions/functions_db.php')
| -rw-r--r-- | includes/functions/functions_db.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php index 813372c124..97caabd5f1 100644 --- a/includes/functions/functions_db.php +++ b/includes/functions/functions_db.php @@ -559,7 +559,7 @@ function fetch_linked_indi($xref, $link, $ged_id) { " JOIN `##link` ON (i_file=l_file AND i_id=l_from)". " LEFT JOIN `##name` ON (i_file=n_file AND i_id=n_id AND n_num=0)". " WHERE i_file=? AND l_type=? AND l_to=?". - " ORDER BY n_sort" + " ORDER BY n_sort COLLATE '".i18n::$collation."'" )->execute(array($ged_id, $link, $xref))->fetchAll(PDO::FETCH_ASSOC); $list=array(); @@ -575,7 +575,7 @@ function fetch_linked_fam($xref, $link, $ged_id) { " JOIN `##link` ON (f_file=l_file AND f_id=l_from)". " LEFT JOIN `##name` ON (f_file=n_file AND f_id=n_id AND n_num=0)". " WHERE f_file=? AND l_type=? AND l_to=?". - " ORDER BY n_sort" + " ORDER BY n_sort" // n_sort is not used for families. Sorting here has no effect??? )->execute(array($ged_id, $link, $xref))->fetchAll(PDO::FETCH_ASSOC); $list=array(); @@ -591,7 +591,7 @@ function fetch_linked_note($xref, $link, $ged_id) { " JOIN `##link` ON (o_file=l_file AND o_id=l_from)". " LEFT JOIN `##name` ON (o_file=n_file AND o_id=n_id AND n_num=0)". " WHERE o_file=? AND o_type='NOTE' AND l_type=? AND l_to=?". - " ORDER BY n_sort" + " ORDER BY n_sort COLLATE '".i18n::$collation."'" )->execute(array($ged_id, $link, $xref))->fetchAll(PDO::FETCH_ASSOC); $list=array(); @@ -607,7 +607,7 @@ function fetch_linked_sour($xref, $link, $ged_id) { " JOIN `##link` ON (s_file=l_file AND s_id=l_from)". " LEFT JOIN `##name` ON (s_file=n_file AND s_id=n_id AND n_num=0)". " WHERE s_file=? AND l_type=? AND l_to=?". - " ORDER BY n_sort" + " ORDER BY n_sort COLLATE '".i18n::$collation."'" )->execute(array($ged_id, $link, $xref))->fetchAll(PDO::FETCH_ASSOC); $list=array(); @@ -623,7 +623,7 @@ function fetch_linked_obje($xref, $link, $ged_id) { " JOIN `##link` ON (m_gedfile=l_file AND m_media=l_from)". " LEFT JOIN `##name` ON (m_gedfile=n_file AND m_media=n_id AND n_num=0)". " WHERE m_gedfile=? AND l_type=? AND l_to=?". - " ORDER BY n_sort" + " ORDER BY n_sort COLLATE '".i18n::$collation."'" )->execute(array($ged_id, $link, $xref))->fetchAll(PDO::FETCH_ASSOC); $list=array(); |