diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-11-01 18:17:25 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-11-01 18:17:25 +0000 |
| commit | 677b8aa47ed770807b6f61f8b001f3fb2ffad6a2 (patch) | |
| tree | cce217cefc89dbf20c085c51a67272b919a8be7e /library/WT/Query | |
| parent | b1457a6c7c6aea70f6e1298a537433a630cf85ac (diff) | |
| download | webtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.tar.gz webtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.tar.bz2 webtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.zip | |
Tidy up trailing whitespace
Diffstat (limited to 'library/WT/Query')
| -rw-r--r-- | library/WT/Query/Media.php | 2 | ||||
| -rw-r--r-- | library/WT/Query/Name.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/library/WT/Query/Media.php b/library/WT/Query/Media.php index 82fde1044c..813a239bf8 100644 --- a/library/WT/Query/Media.php +++ b/library/WT/Query/Media.php @@ -64,7 +64,7 @@ class WT_Query_Media { // Generate a filtered, sourced, privacy-checked list of media objects - for the media list. public static function mediaList($folder, $subfolders, $sort, $filter) { // All files in the folder, plus external files - $sql = + $sql = "SELECT m_id AS xref, m_file AS gedcom_id, m_gedcom AS gedcom" . " FROM `##media`" . " WHERE m_file=?"; diff --git a/library/WT/Query/Name.php b/library/WT/Query/Name.php index acfb40a97e..28625536be 100644 --- a/library/WT/Query/Name.php +++ b/library/WT/Query/Name.php @@ -345,7 +345,7 @@ class WT_Query_Name { " JOIN (SELECT n_surn, n_file FROM `##name`". " WHERE n_file={$ged_id}". ($marnm ? "" : " AND n_type!='_MARNM'"); - + if ($surn) { $sql.=" AND n_surn COLLATE '".WT_I18N::$collation."' =".WT_DB::quote($surn); } elseif ($salpha==',') { @@ -362,7 +362,7 @@ class WT_Query_Name { if (!$marnm) { $sql.=" AND n_type!='_MARNM'"; } - + $list=array(); foreach (WT_DB::prepare($sql)->fetchAll() as $row) { $list[utf8_strtoupper($row->n_surn)][$row->n_surname][$row->n_id]=true; @@ -391,7 +391,7 @@ class WT_Query_Name { ($fams ? "JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : ""). "WHERE n_file={$ged_id} ". ($marnm ? "" : "AND n_type!='_MARNM'"); - + if ($surn) { $sql.=" AND n_surn COLLATE '".WT_I18N::$collation."'=".WT_DB::quote($surn); } elseif ($salpha==',') { @@ -407,9 +407,9 @@ class WT_Query_Name { if ($galpha) { $sql.=" AND ".self::_getInitialSql('n_givn', $galpha); } - + $sql.=" ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE '".WT_I18N::$collation."', CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE '".WT_I18N::$collation."'"; - + $list=array(); $rows=WT_DB::prepare($sql)->fetchAll(); foreach ($rows as $row) { |