From: Alan Pippin <apippin@pippins.net>
Date: Fri, 1 Oct 2010 20:13:09 +0000 (-0600)
Subject: Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenle... 
X-Git-Tag: release_1_0_0~5
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=7bb723fd27b007ab4f83131542012aee588625aa;hp=48822498ab9ae5faa5d30ddfe8b9113a22e1e0c3;p=eq%2F.git

Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenleonard/database_changes
---

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index c44a589..45d012e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -1757,7 +1757,7 @@ class tc
 				$hti_pri = $entry['pri'];
 				//print "hti_notes: $hti_notes indiv_name: $indiv_name <Br>";
 				// Perform database save actions here
-				$this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+				$this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__);
 				if ($this->db->next_record()) {
 					$scheduling_priority = $this->db->f('scheduling_priority');
 					//$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");