last commit just used tc_presidency.email, changed it to use tc_presidency.email... owenleonard/database_changes
authorOwen Leonard <owen@balawis.leonard.fam>
Fri, 1 Oct 2010 21:15:46 +0000 (15:15 -0600)
committerOwen Leonard <owen@balawis.leonard.fam>
Fri, 1 Oct 2010 21:15:46 +0000 (15:15 -0600)
inc/class.tc.inc.php

index a6ad7c1da201b869fbd715ec397a181dca3fd07d..7dea31762c1808d7d497a940997f2b17f755bcc0 100644 (file)
@@ -4257,10 +4257,14 @@ class tc
                        $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
                        $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
 
-                       $sql = "SELECT tp.email AS email, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
+                       $sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
                        $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
-                               $email = $this->db2->f('email');
+                               if ($this->db2->f('email1') != "") {
+                                       $email = $this->db2->f('email1');
+                               } else { 
+                                       $email = $this->db2->f('email2');
+                               }
                                $interviewer = $this->db2->f('name');
                        }