Fix #903 - redirect after login

1 files changed, 3 insertions, 1 deletions

diff --git a/login.php b/login.php
index c15c8457eb..2a13b085b1 100644
--- a/login.php
+++ b/login.php
@@ -127,9 +127,11 @@ case 'login':
 			// Switch to a tree where we have a genealogy record (or keep to the current/default).
 			$tree = Database::prepare(
 				"SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
-				" WHERE setting_name = 'gedcomid' AND user_id = :user_id"
+				" WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
+				" ORDER BY gedcom_id = :tree_id DESC"
 			)->execute(array(
 				'user_id' => Auth::user()->getUserId(),
+				'tree_id' => $WT_TREE->getTreeId(),
 			))->fetchOne();
 			$url .= '&ged=' . Filter::escapeUrl($tree);
 		}