From 80b2f69061e9c1790d66a4410ee59777a6d60093 Mon Sep 17 00:00:00 2001 From: Ilyaaaaaaaaaaaaa Zhitomirskiy Date: Wed, 7 Sep 2011 11:37:52 -0700 Subject: [PATCH] Revert "capitalization" This reverts commit 9e0afb4a3360c08d74ad9358a6b31f30168681b1. --- lib/csv_generator.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/csv_generator.rb b/lib/csv_generator.rb index 17f619665..e0ffa3750 100644 --- a/lib/csv_generator.rb +++ b/lib/csv_generator.rb @@ -61,7 +61,7 @@ SQL SELECT '%EMAIL%','%NAME%','%INVITATION_LINK%' UNION SELECT `users`.email AS '%EMAIL%', - 'Friend of Diaspora*' AS '%NAME%', + 'friend of Diaspora*' AS '%NAME%', CONCAT( 'https://joindiaspora.com/users/invitation/accept?invitation_token=', `users`.invitation_token) AS '%INVITATION_LINK%' #{self.output_syntax(file)} FROM `users` @@ -91,7 +91,7 @@ SQL SELECT '%EMAIL%','%NAME%','%INVITATION_LINK%' UNION SELECT `users`.email AS '%EMAIL%', - 'Friend of Diaspora*' AS '%NAME%', + 'friend of Diaspora*' AS '%NAME%', CONCAT( 'https://joindiaspora.com/users/invitation/accept?invitation_token=', `users`.invitation_token) AS '%INVITATION_LINK%' #{self.output_syntax(file)} FROM `users` @@ -110,7 +110,8 @@ SQL UNION SELECT `users`.email AS '%EMAIL%', IF( `profiles`.full_name IS NOT NULL AND `profiles`.full_name != "", - `profiles`.full_name, 'Friend of Diaspora*') AS '%NAME%', + `profiles`.full_name, 'friend of Diaspora*') AS '%NAME%', + IF(`users`.invitation_token, CONCAT( 'https://joindiaspora.com/users/invitation/accept?invitation_token=', `users`.invitation_token) ,NULL) AS '%INVITATION_LINK%' #{self.output_syntax(file)} FROM `users` JOIN `people` ON `users`.id = `people`.owner_id JOIN `profiles` ON `people`.id = `profiles`.person_id