Simplify SQL statements. Use "##table_name" instead of "{$TBLPREFIX}table_name"

25 files changed, 133 insertions, 184 deletions

diff --git a/modules/GEDFact_assistant/_CENS/census_query1a.php b/modules/GEDFact_assistant/_CENS/census_query1a.php
index 8573e3e4cc..e027cd32d0 100644
--- a/modules/GEDFact_assistant/_CENS/census_query1a.php
+++ b/modules/GEDFact_assistant/_CENS/census_query1a.php
@@ -40,7 +40,7 @@
 
 // database info: Change password and DB Name ===================
 //	$dbh = new PDO("$DBTYPE:host=$DBHOST;dbname=$DBNAME", $DBUSER, $DBPASS);
-//	$statement=$DBH::prepare("SELECT 'INDI' AS type, l_from, l_to FROM {$TBLPREFIX}link, {$TBLPREFIX}individuals WHERE l_from LIKE 'I%' AND i_file=l_file AND i_id=l_from AND l_file='1' AND l_type='NOTE' AND l_to='$noteid'")->execute();
+//	$statement=$DBH::prepare("SELECT 'INDI' AS type, l_from, l_to FROM ##link, ##individuals WHERE l_from LIKE 'I%' AND i_file=l_file AND i_id=l_from AND l_file='1' AND l_type='NOTE' AND l_to='$noteid'")->execute();
 
 	$db = mysql_connect($DBHOST, $DBUSER, $DBPASS) or die (mysql_error());
 	mysql_select_db ($DBNAME, $db) or die (mysql_error());
@@ -56,7 +56,7 @@
 	$output .= "<td width=\'25\' align=\'center\' bgcolor=\'#AAAAAA\' nowrap='nowrap'><span class=\'style1\'>&nbsp;&nbsp;Unlink</span></td>";
 	$output .= "</tr>";
 
-	$res_indis = mysql_query("SELECT 'INDI' AS type, l_from, l_to FROM {$TBLPREFIX}link, {$TBLPREFIX}individuals WHERE l_from LIKE 'I%' AND i_file=l_file AND i_id=l_from AND l_file='1' AND l_type='NOTE' AND l_to='$noteid'");
+	$res_indis = mysql_query("SELECT 'INDI' AS type, l_from, l_to FROM ##link, ##individuals WHERE l_from LIKE 'I%' AND i_file=l_file AND i_id=l_from AND l_file='1' AND l_type='NOTE' AND l_to='$noteid'");
 	
 //	while ($rows = $statement->fetch(PDO::FETCH_NUM)) {
 //		$output .= "<tr><td> $rows[0]</td><td> $rows[1]</td><td> $rows[2]</td></tr>";
diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 3f2913109f..760d4c5c02 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -132,7 +132,7 @@ if ($action == "choose" && $paramok) {
 	if (!empty($mediaid)) {
 		//-- Get the title of this existing Media item
 		$title=
-			WT_DB::prepare("SELECT m_titl FROM {$TBLPREFIX}media where m_media=? AND m_gedfile=?")
+			WT_DB::prepare("SELECT m_titl FROM ##media where m_media=? AND m_gedfile=?")
 			->execute(array($mediaid, WT_GED_ID))
 			->fetchOne();
 		if ($title) {
@@ -146,7 +146,7 @@ if ($action == "choose" && $paramok) {
 		echo '<table><tr><td>';
 		//-- Get the filename of this existing Media item
 		$filename=
-			WT_DB::prepare("SELECT m_file FROM {$TBLPREFIX}media where m_media=? AND m_gedfile=?")
+			WT_DB::prepare("SELECT m_file FROM ##media where m_media=? AND m_gedfile=?")
 			->execute(array($mediaid, WT_GED_ID))
 			->fetchOne();
 		$filename = str_replace(" ", "%20", $filename);
diff --git a/modules/batch_update/batch_update.php b/modules/batch_update/batch_update.php
index b9385c40d7..d1a3241bf2 100644
--- a/modules/batch_update/batch_update.php
+++ b/modules/batch_update/batch_update.php
@@ -242,30 +242,28 @@ class batch_update {
 	}
 
 	function getAllXrefs() {
-		global $TBLPREFIX;
-
 		$sql=array();
 		$vars=array();
 		foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
 			switch ($type) {
 			case 'INDI':
-				$sql[]="SELECT i_id, 'INDI' FROM {$TBLPREFIX}individuals WHERE i_file=?";
+				$sql[]="SELECT i_id, 'INDI' FROM ##individuals WHERE i_file=?";
 				$vars[]=WT_GED_ID;
 				break;
 			case 'FAM':
-				$sql[]="SELECT f_id, 'FAM' FROM {$TBLPREFIX}families WHERE f_file=?";
+				$sql[]="SELECT f_id, 'FAM' FROM ##families WHERE f_file=?";
 				$vars[]=WT_GED_ID;
 				break;
 			case 'SOUR':
-				$sql[]="SELECT s_id, 'SOUR' FROM {$TBLPREFIX}sources WHERE s_file=?";
+				$sql[]="SELECT s_id, 'SOUR' FROM ##sources WHERE s_file=?";
 				$vars[]=WT_GED_ID;
 				break;
 			case 'OBJE':
-				$sql[]="SELECT m_media, 'OBJE' FROM {$TBLPREFIX}media WHERE m_gedfile=?";
+				$sql[]="SELECT m_media, 'OBJE' FROM ##media WHERE m_gedfile=?";
 				$vars[]=WT_GED_ID;
 				break;
 			default:
-				$sql[]="SELECT o_id, ? FROM {$TBLPREFIX}other WHERE o_type=? AND o_file=?";
+				$sql[]="SELECT o_id, ? FROM ##other WHERE o_type=? AND o_file=?";
 				$vars[]=$type;
 				$vars[]=$type;
 				$vars[]=WT_GED_ID;
diff --git a/modules/descendancy/module.php b/modules/descendancy/module.php
index 36b5699b00..9896a10b2e 100644
--- a/modules/descendancy/module.php
+++ b/modules/descendancy/module.php
@@ -185,11 +185,11 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 
 	public function search($query) {
-		global $TBLPREFIX, $WT_IMAGES, $WT_IMAGE_DIR;
+		global $WT_IMAGES, $WT_IMAGE_DIR;
 		if (strlen($query)<2) return '';
 		$sql=
 		"SELECT ? AS type, i_id AS xref, i_file AS ged_id, i_gedcom AS gedrec, i_isdead, i_sex".
-		" FROM {$TBLPREFIX}individuals, {$TBLPREFIX}name".
+		" FROM ##individuals, ##name".
 		" WHERE (i_id LIKE ? OR n_sort LIKE ?)".
 		" AND i_id=n_id AND i_file=n_file AND i_file=?".
 		" ORDER BY n_sort";
diff --git a/modules/families/module.php b/modules/families/module.php
index a340d960ad..ce43c2442e 100644
--- a/modules/families/module.php
+++ b/modules/families/module.php
@@ -206,13 +206,12 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 
 	public function search($query) {
-		global $TBLPREFIX;
 		if (strlen($query)<2) return '';
 
 		//-- search for INDI names
 		$sql=
 		"SELECT ? AS type, i_id AS xref, i_file AS ged_id, i_gedcom AS gedrec, i_isdead, i_sex".
-		" FROM {$TBLPREFIX}individuals, {$TBLPREFIX}name".
+		" FROM ##individuals, ##name".
 		" WHERE (i_id LIKE ? OR n_sort LIKE ?)".
 		" AND i_id=n_id AND i_file=n_file AND i_file=?".
 		" ORDER BY n_sort";
@@ -237,7 +236,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			$vars=array_merge($vars, $ids, $ids);
 		}
 
-		$sql="SELECT ? AS type, f_id AS xref, f_file AS ged_id, f_gedcom AS gedrec, f_husb, f_wife, f_chil, f_numchil FROM {$TBLPREFIX}families WHERE {$where} AND f_file=?";
+		$sql="SELECT ? AS type, f_id AS xref, f_file AS ged_id, f_gedcom AS gedrec, f_husb, f_wife, f_chil, f_numchil FROM ##families WHERE {$where} AND f_file=?";
 		$vars[]=WT_GED_ID;
 		$rows=
 		WT_DB::prepareLimit($sql, WT_AUTOCOMPLETE_LIMIT)
diff --git a/modules/faq/module.php b/modules/faq/module.php
index e8b6c3aa02..a3ef0a2d36 100644
--- a/modules/faq/module.php
+++ b/modules/faq/module.php
@@ -102,8 +102,6 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 
 	// Action from the configuration page
 	private function edit() {
-		global $TBLPREFIX;
-
 		require_once WT_ROOT.'includes/functions/functions_edit.php';
 
 		$useFCK = file_exists(WT_ROOT.'modules/fck_editor/fckeditor.php');
@@ -115,7 +113,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 			$block_id=safe_POST('block_id');
 			if ($block_id) {
 				WT_DB::prepare(
-					"UPDATE {$TBLPREFIX}block SET gedcom_id=?, block_order=? WHERE block_id=?"
+					"UPDATE ##block SET gedcom_id=?, block_order=? WHERE block_id=?"
 				)->execute(array(
 					safe_POST('gedcom_id'),
 					(int)safe_POST('block_order'),
@@ -123,7 +121,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 				));
 			} else {
 				WT_DB::prepare(
-					"INSERT INTO {$TBLPREFIX}block (gedcom_id, module_name, block_order) VALUES (?, ?, ?)"
+					"INSERT INTO ##block (gedcom_id, module_name, block_order) VALUES (?, ?, ?)"
 				)->execute(array(
 					safe_POST('gedcom_id', array_keys(get_all_gedcoms())),
 					$this->getName(),
@@ -151,17 +149,17 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 				$header=get_block_setting($block_id, 'header');
 				$body=get_block_setting($block_id, 'body');
 				$block_order=WT_DB::prepare(
-					"SELECT block_order FROM {$TBLPREFIX}block WHERE block_id=?"
+					"SELECT block_order FROM ##block WHERE block_id=?"
 				)->execute(array($block_id))->fetchOne();
 				$gedcom_id=WT_DB::prepare(
-					"SELECT gedcom_id FROM {$TBLPREFIX}block WHERE block_id=?"
+					"SELECT gedcom_id FROM ##block WHERE block_id=?"
 				)->execute(array($block_id))->fetchOne();
 			} else {
 				print_header(i18n::translate('Add FAQ item'));
 				$header='';
 				$body='';
 				$block_order=WT_DB::prepare(
-					"SELECT IFNULL(MAX(block_order)+1, 0) FROM {$TBLPREFIX}block WHERE module_name=?"
+					"SELECT IFNULL(MAX(block_order)+1, 0) FROM ##block WHERE module_name=?"
 				)->execute(array($this->getName()))->fetchOne();
 				$gedcom_id=WT_GED_ID;
 			}
@@ -208,87 +206,79 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 	}
 
 	private function delete() {
-		global $TBLPREFIX;
-
 		$block_id=safe_GET('block_id');
 
 		$block_order=WT_DB::prepare(
-			"SELECT block_order FROM {$TBLPREFIX}block WHERE block_id=?"
+			"SELECT block_order FROM ##block WHERE block_id=?"
 		)->execute(array($block_id))->fetchOne();
 
 		WT_DB::prepare(
-			"DELETE FROM {$TBLPREFIX}block_setting WHERE block_id=?"
+			"DELETE FROM ##block_setting WHERE block_id=?"
 		)->execute(array($block_id));
 
 		WT_DB::prepare(
-			"DELETE FROM {$TBLPREFIX}block WHERE block_id=?"
+			"DELETE FROM ##block WHERE block_id=?"
 		)->execute(array($block_id));
 	}
 
 	private function moveup() {
-		global $TBLPREFIX;
-
 		$block_id=safe_GET('block_id');
 
 		$block_order=WT_DB::prepare(
-			"SELECT block_order FROM {$TBLPREFIX}block WHERE block_id=?"
+			"SELECT block_order FROM ##block WHERE block_id=?"
 		)->execute(array($block_id))->fetchOne();
 
 		$swap_block=WT_DB::prepare(
 			"SELECT block_order, block_id".
-			" FROM {$TBLPREFIX}block".
+			" FROM ##block".
 			" WHERE block_order=(".
-			"  SELECT MAX(block_order) FROM {$TBLPREFIX}block WHERE block_order<? AND module_name=?".
+			"  SELECT MAX(block_order) FROM ##block WHERE block_order<? AND module_name=?".
 			" )".
 			" LIMIT 1"
 		)->execute(array($block_order, $this->getName()))->fetchOneRow();
 		if ($swap_block) {
 			WT_DB::prepare(
-				"UPDATE {$TBLPREFIX}block SET block_order=? WHERE block_id=?"
+				"UPDATE ##block SET block_order=? WHERE block_id=?"
 			)->execute(array($swap_block->block_order, $block_id));
 			WT_DB::prepare(
-				"UPDATE {$TBLPREFIX}block SET block_order=? WHERE block_id=?"
+				"UPDATE ##block SET block_order=? WHERE block_id=?"
 			)->execute(array($block_order, $swap_block->block_id));
 		}
 	}
 
 	private function movedown() {
-		global $TBLPREFIX;
-
 		$block_id=safe_GET('block_id');
 
 		$block_order=WT_DB::prepare(
-			"SELECT block_order FROM {$TBLPREFIX}block WHERE block_id=?"
+			"SELECT block_order FROM ##block WHERE block_id=?"
 		)->execute(array($block_id))->fetchOne();
 
 		$swap_block=WT_DB::prepare(
 			"SELECT block_order, block_id".
-			" FROM {$TBLPREFIX}block".
+			" FROM ##block".
 			" WHERE block_order=(".
-			"  SELECT MIN(block_order) FROM {$TBLPREFIX}block WHERE block_order>? AND module_name=?".
+			"  SELECT MIN(block_order) FROM ##block WHERE block_order>? AND module_name=?".
 			" )".
 			" LIMIT 1"
 		)->execute(array($block_order, $this->getName()))->fetchOneRow();
 		if ($swap_block) {
 			WT_DB::prepare(
-				"UPDATE {$TBLPREFIX}block SET block_order=? WHERE block_id=?"
+				"UPDATE ##block SET block_order=? WHERE block_id=?"
 			)->execute(array($swap_block->block_order, $block_id));
 			WT_DB::prepare(
-				"UPDATE {$TBLPREFIX}block SET block_order=? WHERE block_id=?"
+				"UPDATE ##block SET block_order=? WHERE block_id=?"
 			)->execute(array($block_order, $swap_block->block_id));
 		}
 	}
 
 	private function show() {
-		global $TBLPREFIX;
-
 		print_header($this->getTitle());
 
 		$faqs=WT_DB::prepare(
 			"SELECT block_id, bs1.setting_value AS header, bs2.setting_value AS body".
-			" FROM {$TBLPREFIX}block b".
-			" JOIN {$TBLPREFIX}block_setting bs1 USING (block_id)".
-			" JOIN {$TBLPREFIX}block_setting bs2 USING (block_id)".
+			" FROM ##block b".
+			" JOIN ##block_setting bs1 USING (block_id)".
+			" JOIN ##block_setting bs2 USING (block_id)".
 			" WHERE module_name=?".
 			" AND bs1.setting_name='header'".
 			" AND bs2.setting_name='body'".
@@ -356,15 +346,15 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 	}
 
 	private function config() {
-		global $TBLPREFIX, $WT_IMAGES, $WT_IMAGE_DIR;
+		global $WT_IMAGES, $WT_IMAGE_DIR;
 
 		print_header($this->getTitle());
 
 		$faqs=WT_DB::prepare(
 			"SELECT block_id, block_order, gedcom_id, bs1.setting_value AS header, bs2.setting_value AS body".
-			" FROM {$TBLPREFIX}block b".
-			" JOIN {$TBLPREFIX}block_setting bs1 USING (block_id)".
-			" JOIN {$TBLPREFIX}block_setting bs2 USING (block_id)".
+			" FROM ##block b".
+			" JOIN ##block_setting bs1 USING (block_id)".
+			" JOIN ##block_setting bs2 USING (block_id)".
 			" WHERE module_name=?".
 			" AND bs1.setting_name='header'".
 			" AND bs2.setting_name='body'".
@@ -373,11 +363,11 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 		)->execute(array($this->getName(), WT_GED_ID))->fetchAll();
 
 		$min_block_order=WT_DB::prepare(
-			"SELECT MIN(block_order) FROM {$TBLPREFIX}block WHERE module_name=?"
+			"SELECT MIN(block_order) FROM ##block WHERE module_name=?"
 		)->execute(array($this->getName()))->fetchOne();
 
 		$max_block_order=WT_DB::prepare(
-			"SELECT MAX(block_order) FROM {$TBLPREFIX}block WHERE module_name=?"
+			"SELECT MAX(block_order) FROM ##block WHERE module_name=?"
 		)->execute(array($this->getName()))->fetchOne();
 
 		echo '<table class="list_table width100">';
diff --git a/modules/gedcom_favorites/db_schema/db_schema_0_1.php b/modules/gedcom_favorites/db_schema/db_schema_0_1.php
index d1ddd71e2b..bb8ae1b7cb 100644
--- a/modules/gedcom_favorites/db_schema/db_schema_0_1.php
+++ b/modules/gedcom_favorites/db_schema/db_schema_0_1.php
@@ -43,7 +43,7 @@ exit;
 define('WT_FV_DB_SCHEMA_0_1', '');
 
 WT_DB::exec(
-	"CREATE TABLE IF NOT EXISTS {$TBLPREFIX}favorites (".
+	"CREATE TABLE IF NOT EXISTS ##favorites (".
 	" fv_id       INTEGER AUTO_INCREMENT NOT NULL,".
  	" fv_username VARCHAR(32)            NOT NULL,".
 	" fv_gid      VARCHAR(20)                NULL,".
diff --git a/modules/gedcom_favorites/module.php b/modules/gedcom_favorites/module.php
index fd52039385..9e7d7ccf77 100644
--- a/modules/gedcom_favorites/module.php
+++ b/modules/gedcom_favorites/module.php
@@ -314,10 +314,8 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param int $fv_id	the id of the favorite to delete
 	 */
 	public static function deleteFavorite($fv_id) {
-		global $TBLPREFIX;
-	
 		return (bool)
-			WT_DB::prepare("DELETE FROM {$TBLPREFIX}favorites WHERE fv_id=?")
+			WT_DB::prepare("DELETE FROM ##favorites WHERE fv_id=?")
 			->execute(array($fv_id));
 	}
 
@@ -326,14 +324,12 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param array $favorite	the favorite array of the favorite to add
 	 */
 	public static function addFavorite($favorite) {
-		global $TBLPREFIX;
-
 		// -- make sure a favorite is added
 		if (empty($favorite["gid"]) && empty($favorite["url"]))
 			return false;
 
 		//-- make sure this is not a duplicate entry
-		$sql = "SELECT 1 FROM {$TBLPREFIX}favorites WHERE";
+		$sql = "SELECT 1 FROM ##favorites WHERE";
 		if (!empty($favorite["gid"])) {
 			$sql.=" fv_gid=?";
 			$vars=array($favorite["gid"]);
@@ -351,7 +347,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	
 		//-- add the favorite to the database
 		return (bool)
-			WT_DB::prepare("INSERT INTO {$TBLPREFIX}favorites (fv_id, fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,? ,?)")
+			WT_DB::prepare("INSERT INTO ##favorites (fv_id, fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,? ,?)")
 				->execute(array(get_next_id("favorites", "fv_id"), $favorite["username"], $favorite["gid"], $favorite["type"], $favorite["file"], $favorite["url"], $favorite["title"], $favorite["note"]));
 	}
 
@@ -361,10 +357,8 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param string $username		the username to get the favorites for
 	 */
 	public static function getUserFavorites($username) {
-		global $TBLPREFIX;
-	
 		$rows=
-			WT_DB::prepare("SELECT * FROM {$TBLPREFIX}favorites WHERE fv_username=?")
+			WT_DB::prepare("SELECT * FROM ##favorites WHERE fv_username=?")
 			->execute(array($username))
 			->fetchAll();
 	
diff --git a/modules/gedcom_news/db_schema/db_schema_0_1.php b/modules/gedcom_news/db_schema/db_schema_0_1.php
index 3674cb9fa8..da66bc148d 100644
--- a/modules/gedcom_news/db_schema/db_schema_0_1.php
+++ b/modules/gedcom_news/db_schema/db_schema_0_1.php
@@ -43,7 +43,7 @@ exit;
 define('WT_FV_DB_SCHEMA_0_1', '');
 
 WT_DB::exec(
-	"CREATE TABLE IF NOT EXISTS {$TBLPREFIX}news (".
+	"CREATE TABLE IF NOT EXISTS ##news (".
 	" n_id       INTEGER AUTO_INCREMENT NOT NULL,".
 	" n_username VARCHAR(100)           NOT NULL,".
 	" n_date     INTEGER                NOT NULL,".
diff --git a/modules/googlemap/db_schema/db_schema_0_1.php b/modules/googlemap/db_schema/db_schema_0_1.php
index 7b26dba40c..2ee3410e99 100644
--- a/modules/googlemap/db_schema/db_schema_0_1.php
+++ b/modules/googlemap/db_schema/db_schema_0_1.php
@@ -43,9 +43,9 @@ exit;
 define('WT_GM_DB_SCHEMA_0_1', '');
 
 // Create all of the tables needed for this module
-if (!WT_DB::table_exists("{$TBLPREFIX}placelocation")) {
+if (!WT_DB::table_exists("##placelocation")) {
 	WT_DB::exec(
-		"CREATE TABLE {$TBLPREFIX}placelocation (".
+		"CREATE TABLE ##placelocation (".
 		" pl_id        INTEGER         NOT NULL,".
 		" pl_parent_id INTEGER             NULL,".
 		" pl_level     INTEGER             NULL,".
@@ -57,11 +57,11 @@ if (!WT_DB::table_exists("{$TBLPREFIX}placelocation")) {
 		" PRIMARY KEY (pl_id)".
 		") COLLATE utf8_unicode_ci ENGINE=InnoDB"
 	);
-	self::exec("CREATE INDEX {$TBLPREFIX}pl_level     ON {$TBLPREFIX}placelocation (pl_level    )");
-	self::exec("CREATE INDEX {$TBLPREFIX}pl_long      ON {$TBLPREFIX}placelocation (pl_long     )");
-	self::exec("CREATE INDEX {$TBLPREFIX}pl_lati      ON {$TBLPREFIX}placelocation (pl_lati     )");
-	self::exec("CREATE INDEX {$TBLPREFIX}pl_name      ON {$TBLPREFIX}placelocation (pl_place    )");
-	self::exec("CREATE INDEX {$TBLPREFIX}pl_parent_id ON {$TBLPREFIX}placelocation (pl_parent_id)");
+	self::exec("CREATE INDEX ##pl_level     ON ##placelocation (pl_level    )");
+	self::exec("CREATE INDEX ##pl_long      ON ##placelocation (pl_long     )");
+	self::exec("CREATE INDEX ##pl_lati      ON ##placelocation (pl_lati     )");
+	self::exec("CREATE INDEX ##pl_name      ON ##placelocation (pl_place    )");
+	self::exec("CREATE INDEX ##pl_parent_id ON ##placelocation (pl_parent_id)");
 
 }
 
diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php
index 206785fd03..618e3ff5a6 100644
--- a/modules/googlemap/googlemap.php
+++ b/modules/googlemap/googlemap.php
@@ -272,7 +272,6 @@ function abbreviate($text) {
 }
 
 function get_lati_long_placelocation ($place) {
-	global $TBLPREFIX;
 	$parent = explode (",", $place);
 	$parent = array_reverse($parent);
 	$place_id = 0;
@@ -282,7 +281,7 @@ function get_lati_long_placelocation ($place) {
 		$placelist = create_possible_place_names($parent[$i], $i+1);
 		foreach ($placelist as $key => $placename) {
 			$pl_id=
-				WT_DB::prepare("SELECT pl_id FROM {$TBLPREFIX}placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
+				WT_DB::prepare("SELECT pl_id FROM ##placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 				->execute(array($i, $place_id, $placename))
 				->fetchOne();
 			if (!empty($pl_id)) break;
@@ -292,7 +291,7 @@ function get_lati_long_placelocation ($place) {
 	}
 
 	$row=
-		WT_DB::prepare("SELECT pl_lati, pl_long, pl_zoom, pl_icon, pl_level FROM {$TBLPREFIX}placelocation WHERE pl_id=? ORDER BY pl_place")
+		WT_DB::prepare("SELECT pl_lati, pl_long, pl_zoom, pl_icon, pl_level FROM ##placelocation WHERE pl_id=? ORDER BY pl_place")
 		->execute(array($place_id))
 		->fetchOneRow();
 	if ($row) {
@@ -428,7 +427,7 @@ function create_indiv_buttons() {
 function build_indiv_map($indifacts, $famids) {
 	global $GOOGLEMAP_API_KEY, $GOOGLEMAP_MAP_TYPE, $GOOGLEMAP_MIN_ZOOM, $GOOGLEMAP_MAX_ZOOM, $GEDCOM;
 	global $GOOGLEMAP_XSIZE, $GOOGLEMAP_YSIZE, $SHOW_LIVING_NAMES;
-	global $GOOGLEMAP_ENABLED, $TBLPREFIX, $TEXT_DIRECTION, $GM_DEFAULT_TOP_VALUE, $GOOGLEMAP_COORD;
+	global $GOOGLEMAP_ENABLED, $TEXT_DIRECTION, $GM_DEFAULT_TOP_VALUE, $GOOGLEMAP_COORD;
 
 	if (!$GOOGLEMAP_ENABLED) {
 		echo "<table class=\"facts_table\">\n";
@@ -453,7 +452,7 @@ function build_indiv_map($indifacts, $famids) {
 	$markers=array();
 
 	$zoomLevel = $GOOGLEMAP_MAX_ZOOM;
-	$placelocation=WT_DB::table_exists("{$TBLPREFIX}placelocation");
+	$placelocation=WT_DB::table_exists("##placelocation");
 	//-- sort the facts
 	//sort_facts($indifacts); facts should already be sorted
 	$i = 0;
diff --git a/modules/googlemap/module.php b/modules/googlemap/module.php
index 43f681b8da..e1dcd600a5 100644
--- a/modules/googlemap/module.php
+++ b/modules/googlemap/module.php
@@ -87,7 +87,6 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $SEARCH_SPIDER, $SESSION_HIDE_GOOGLEMAP, $WT_IMAGE_DIR, $WT_IMAGES;
-		global $TBLPREFIX;
 		global $GOOGLEMAP_ENABLED, $GOOGLEMAP_API_KEY, $GOOGLEMAP_MAP_TYPE, $GOOGLEMAP_MIN_ZOOM, $GOOGLEMAP_MAX_ZOOM, $GEDCOM;
 		global $GOOGLEMAP_XSIZE, $GOOGLEMAP_YSIZE, $SHOW_LIVING_NAMES;
 		global $TEXT_DIRECTION, $GM_DEFAULT_TOP_VALUE, $GOOGLEMAP_COORD, $GOOGLEMAP_PH_CONTROLS;
diff --git a/modules/googlemap/placecheck.php b/modules/googlemap/placecheck.php
index 7b706f5edd..0f0aa61ffd 100644
--- a/modules/googlemap/placecheck.php
+++ b/modules/googlemap/placecheck.php
@@ -35,7 +35,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-global $TBLPREFIX;
 $action   =safe_POST     ('action'                                              );
 $gedcom_id=safe_POST     ('gedcom_id', array_keys(get_all_gedcoms()), WT_GED_ID);
 $openinnew=safe_POST_bool('openinnew'                                           );
@@ -79,7 +78,7 @@ echo "<td class='optionbox'><select name='country'>";
 echo "<option value='XYZ' selected='selected'>", i18n::translate('Select Top Level...'), "</option>";
 echo "<option value='XYZ'>", i18n::translate('All'), "</option>";
 $rows=
-	WT_DB::prepare("SELECT pl_id, pl_place FROM {$TBLPREFIX}placelocation WHERE pl_level=0 ORDER BY pl_place")
+	WT_DB::prepare("SELECT pl_id, pl_place FROM ##placelocation WHERE pl_level=0 ORDER BY pl_place")
 	->fetchAssoc();
 foreach ($rows as $id=>$place) {
 	echo "<option value='{$place}'";
@@ -98,7 +97,7 @@ if ($country!='XYZ') {
 	echo "<option value='XYZ' selected='selected'>", i18n::translate('Select Next Level...'), "</option>";
 	echo "<option value='XYZ'>", i18n::translate('All'), "</option>";
 	$places=
-		WT_DB::prepare("SELECT pl_place FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=? ORDER BY pl_place")
+		WT_DB::prepare("SELECT pl_place FROM ##placelocation WHERE pl_parent_id=? ORDER BY pl_place")
 		->execute(array($par_id))
 		->fetchOneColumn();
 	foreach ($places as $place) {
@@ -150,7 +149,7 @@ case 'go':
 	echo "<strong>", i18n::translate('Place list for GEDCOM file'), ": </strong>", htmlspecialchars(get_gedcom_setting($gedcom_id, 'title')), "<br /><br />";
 	//Select all '2 PLAC ' tags in the file and create array
 	$place_list=array();
-	$ged_data=WT_DB::prepare("SELECT i_gedcom FROM {$TBLPREFIX}individuals WHERE i_gedcom LIKE ? AND i_file=?")
+	$ged_data=WT_DB::prepare("SELECT i_gedcom FROM ##individuals WHERE i_gedcom LIKE ? AND i_file=?")
 		->execute(array("%\n2 PLAC %", $gedcom_id))
 		->fetchOneColumn();
 	foreach ($ged_data as $ged_datum) {
@@ -159,7 +158,7 @@ case 'go':
 			$place_list[$match]=true;
 		}
 	}
-	$ged_data=WT_DB::prepare("SELECT f_gedcom FROM {$TBLPREFIX}families WHERE f_gedcom LIKE ? AND f_file=?")
+	$ged_data=WT_DB::prepare("SELECT f_gedcom FROM ##families WHERE f_gedcom LIKE ? AND f_file=?")
 		->execute(array("%\n2 PLAC %", $gedcom_id))
 		->fetchOneColumn();
 	foreach ($ged_data as $ged_datum) {
@@ -271,7 +270,7 @@ case 'go':
 			$placelist=create_possible_place_names($levels[$z], $z+1); // add the necessary prefix/postfix values to the place name
 			foreach ($placelist as $key=>$placename) {
 				$row=
-					WT_DB::prepare("SELECT pl_id, pl_place, pl_long, pl_lati, pl_zoom FROM {$TBLPREFIX}placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
+					WT_DB::prepare("SELECT pl_id, pl_place, pl_long, pl_lati, pl_zoom FROM ##placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 					->execute(array($z, $id, $placename))
 					->fetchOneRow(PDO::FETCH_ASSOC);
 				if (!empty($row['pl_id'])) {
diff --git a/modules/googlemap/placehierarchy.php b/modules/googlemap/placehierarchy.php
index 86857ba165..7c1895e197 100644
--- a/modules/googlemap/placehierarchy.php
+++ b/modules/googlemap/placehierarchy.php
@@ -33,8 +33,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-global $TBLPREFIX;
-
 require WT_ROOT.'modules/googlemap/googlemap.php';
 if (file_exists(WT_ROOT.'modules/googlemap/defaultconfig.php')) {
 	require WT_ROOT.'modules/googlemap/defaultconfig.php';
@@ -43,24 +41,23 @@ require_once WT_ROOT.'includes/classes/class_stats.php';
 $stats = new stats($GEDCOM);
 
 function check_exist_table() {
-	global $TBLPREFIX;
-	return WT_DB::table_exists("{$TBLPREFIX}placelocation");
+	return WT_DB::table_exists("##placelocation");
 }
 
 
 function get_place_list_loc($parent_id, $inactive=false) {
-	global $display, $TBLPREFIX;
+	global $display;
 	if ($inactive) {
 		$rows=
-			WT_DB::prepare("SELECT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=? ORDER BY pl_place")
+			WT_DB::prepare("SELECT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon FROM ##placelocation WHERE pl_parent_id=? ORDER BY pl_place")
 			->execute(array($parent_id))
 			->fetchAll();
 	} else {
 		$rows=
 			WT_DB::prepare(
 				"SELECT DISTINCT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon".
-				" FROM {$TBLPREFIX}placelocation".
-				" INNER JOIN {$TBLPREFIX}places ON {$TBLPREFIX}placelocation.pl_place={$TBLPREFIX}places.p_place AND {$TBLPREFIX}placelocation.pl_level={$TBLPREFIX}places.p_level".
+				" FROM ##placelocation".
+				" INNER JOIN ##places ON ##placelocation.pl_place=##places.p_place AND ##placelocation.pl_level=##places.p_level".
 				" WHERE pl_parent_id=? ORDER BY pl_place"
 			)
 			->execute(array($parent_id))
@@ -75,10 +72,8 @@ function get_place_list_loc($parent_id, $inactive=false) {
 }
 
 function place_id_to_hierarchy($id) {
-	global $TBLPREFIX;
-
 	$statement=
-		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM {$TBLPREFIX}placelocation WHERE pl_id=?");
+		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM ##placelocation WHERE pl_id=?");
 	$arr=array();
 	while ($id!=0) {
 		$row=$statement->execute(array($id))->fetchOneRow();
@@ -89,7 +84,6 @@ function place_id_to_hierarchy($id) {
 }
 
 function get_placeid($place) {
-	global $TBLPREFIX;
 	$par = explode (",", $place);
 	$par = array_reverse($par);
 	$place_id = 0;
@@ -100,7 +94,7 @@ function get_placeid($place) {
 			$placelist = create_possible_place_names($par[$i], $i+1);
 			foreach ($placelist as $key => $placename) {
 				$pl_id=
-					WT_DB::prepare("SELECT pl_id FROM {$TBLPREFIX}placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
+					WT_DB::prepare("SELECT pl_id FROM ##placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 					->execute(array($i, $place_id, $placename))
 					->fetchOne();
 				if (!empty($pl_id)) break;
@@ -113,7 +107,6 @@ function get_placeid($place) {
 }
 
 function get_p_id($place) {
-	global $TBLPREFIX;
 	$par = explode (",", $place);
 	$par = array_reverse($par);
 	$place_id = 0;
@@ -122,7 +115,7 @@ function get_p_id($place) {
 		$placelist = create_possible_place_names($par[$i], $i+1);
 		foreach ($placelist as $key => $placename) {
 			$pl_id=
-				WT_DB::prepare("SELECT p_id FROM {$TBLPREFIX}places WHERE p_level=? AND p_parent_id=? AND p_file=? AND p_place LIKE ? ORDER BY p_place")
+				WT_DB::prepare("SELECT p_id FROM ##places WHERE p_level=? AND p_parent_id=? AND p_file=? AND p_place LIKE ? ORDER BY p_place")
 				->execute(array($i, $place_id, WT_GED_ID, $placename))
 				->fetchOne();
 			if (!empty($pl_id)) break;
diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php
index 592917fd67..5fabc924a0 100644
--- a/modules/googlemap/places.php
+++ b/modules/googlemap/places.php
@@ -39,7 +39,7 @@ if (!defined('WT_WEBTREES')) {
 
 require WT_ROOT.'modules/googlemap/defaultconfig.php';
 
-global $TBLPREFIX, $iso3166;
+global $iso3166;
 $action=safe_REQUEST($_REQUEST, 'action');
 if (isset($_REQUEST['parent']))	 $parent=$_REQUEST['parent'];
 if (isset($_REQUEST['display'])) $display=$_REQUEST['display'];
@@ -55,10 +55,8 @@ if (!isset($display)) $display="";
 // e.g. array(0=>"Top Level", 16=>"England", 19=>"London", 217=>"Westminster");
 // NB This function exists in both places.php and places_edit.php
 function place_id_to_hierarchy($id) {
-	global $TBLPREFIX;
-
 	$statement=
-		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM {$TBLPREFIX}placelocation WHERE pl_id=?");
+		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM ##placelocation WHERE pl_id=?");
 	$arr=array();
 	while ($id!=0) {
 		$row=$statement->execute(array($id))->fetchOneRow();
@@ -70,33 +68,29 @@ function place_id_to_hierarchy($id) {
 
 // NB This function exists in both places.php and places_edit.php
 function getHighestIndex() {
-	global $TBLPREFIX;
-
-	return (int)WT_DB::prepare("SELECT MAX(pl_id) FROM {$TBLPREFIX}placelocation")->fetchOne();
+	return (int)WT_DB::prepare("SELECT MAX(pl_id) FROM ##placelocation")->fetchOne();
 }
 
 function getHighestLevel() {
-	global $TBLPREFIX;
-
-	return (int)WT_DB::prepare("SELECT MAX(pl_level) FROM {$TBLPREFIX}placelocation")->fetchOne();
+	return (int)WT_DB::prepare("SELECT MAX(pl_level) FROM ##placelocation")->fetchOne();
 }
 
 /**
  * Find all of the places in the hierarchy
  */
 function get_place_list_loc($parent_id) {
-	global $display, $TBLPREFIX;
+	global $display;
 	if ($display=="inactive") {
 		$rows=
-			WT_DB::prepare("SELECT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=? ORDER BY pl_place")
+			WT_DB::prepare("SELECT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon FROM ##placelocation WHERE pl_parent_id=? ORDER BY pl_place")
 			->execute(array($parent_id))
 			->fetchAll();
 	} else {
 		$rows=
 			WT_DB::prepare(
 				"SELECT DISTINCT pl_id, pl_place, pl_lati, pl_long, pl_zoom, pl_icon".
-				" FROM {$TBLPREFIX}placelocation".
-				" INNER JOIN {$TBLPREFIX}places ON {$TBLPREFIX}placelocation.pl_place={$TBLPREFIX}places.p_place AND {$TBLPREFIX}placelocation.pl_level={$TBLPREFIX}places.p_level".
+				" FROM ##placelocation".
+				" INNER JOIN ##places ON ##placelocation.pl_place=##places.p_place AND ##placelocation.pl_level=##places.p_level".
 				" WHERE pl_parent_id=? ORDER BY pl_place"
 			)
 			->execute(array($parent_id))
@@ -112,7 +106,6 @@ function get_place_list_loc($parent_id) {
 }
 
 function outputLevel($parent_id) {
-	global $TBLPREFIX;
 	$tmp = place_id_to_hierarchy($parent_id);
 	$maxLevel = getHighestLevel();
 	if ($maxLevel>8) $maxLevel = 8;
@@ -123,7 +116,7 @@ function outputLevel($parent_id) {
 	$level=count($tmp);
 
 	$rows=
-		WT_DB::prepare("SELECT pl_id, pl_place, pl_long, pl_lati, pl_zoom, pl_icon FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=? ORDER BY pl_place")
+		WT_DB::prepare("SELECT pl_id, pl_place, pl_long, pl_lati, pl_zoom, pl_icon FROM ##placelocation WHERE pl_parent_id=? ORDER BY pl_place")
 		->execute(array($parent_id))
 		->fetchAll();
 
@@ -198,11 +191,11 @@ if ($action=="ImportGedcom") {
 	$j=0;
 	if ($mode=="all") {
 		$statement=
-			WT_DB::prepare("SELECT i_gedcom FROM {$TBLPREFIX}individuals UNION ALL SELECT f_gedcom FROM {$TBLPREFIX}families")
+			WT_DB::prepare("SELECT i_gedcom FROM ##individuals UNION ALL SELECT f_gedcom FROM ##families")
 			->execute();
 	} else {
 		$statement=
-			WT_DB::prepare("SELECT i_gedcom FROM {$TBLPREFIX}individuals WHERE i_file=? UNION ALL SELECT f_gedcom FROM {$TBLPREFIX}families WHERE f_file=?")
+			WT_DB::prepare("SELECT i_gedcom FROM ##individuals WHERE i_file=? UNION ALL SELECT f_gedcom FROM ##families WHERE f_file=?")
 			->execute(array(WT_GED_ID, WT_GED_ID));
 	}
 	while ($gedrec=$statement->fetchColumn()) {
@@ -282,14 +275,14 @@ if ($action=="ImportGedcom") {
 				$escparent = "Unknown";
 			}
 			$row=
-				WT_DB::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom FROM {$TBLPREFIX}placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ?")
+				WT_DB::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom FROM ##placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ?")
 				->execute(array($i, $parent_id, $escparent))
 				->fetchOneRow();
 			if ($i < count($parent)-1) {
 				// Create higher-level places, if necessary
 				if (empty($row)) {
 					$highestIndex++;
-					WT_DB::prepare("INSERT INTO {$TBLPREFIX}placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_zoom) VALUES (?, ?, ?, ?, ?)")
+					WT_DB::prepare("INSERT INTO ##placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_zoom) VALUES (?, ?, ?, ?, ?)")
 						->execute(array($highestIndex, $parent_id, $i, $escparent, $default_zoom_level[$i]));
 					echo htmlspecialchars($escparent), '<br />';
 					$parent_id=$highestIndex;
@@ -300,12 +293,12 @@ if ($action=="ImportGedcom") {
 				// Create lowest-level place, if necessary
 				if (empty($row->pl_id)) {
 					$highestIndex++;
-					WT_DB::prepare("INSERT INTO {$TBLPREFIX}placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom) VALUES (?, ?, ?, ?, ?, ?, ?)")
+					WT_DB::prepare("INSERT INTO ##placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom) VALUES (?, ?, ?, ?, ?, ?, ?)")
 						->execute(array($highestIndex, $parent_id, $i, $escparent, $place["long"], $place["lati"], $default_zoom_level[$i]));
 					echo htmlspecialchars($escparent), '<br />';
 				} else {
 					if (empty($row->pl_long) && empty($row->pl_lati) && $place['lati']!="0" && $place['long']!="0") {
-						WT_DB::prepare("UPDATE {$TBLPREFIX}placelocation SET pl_lati=?, pl_long=? WHERE pl_id=?")
+						WT_DB::prepare("UPDATE ##placelocation SET pl_lati=?, pl_long=? WHERE pl_id=?")
 							->execute(array($place["lati"], $place["long"], $row->pl_id));
 						echo htmlspecialchars($escparent), '<br />';
 					}
@@ -369,7 +362,7 @@ if ($action=="ImportFile2") {
 		$country_names[$key]=i18n::translate($key);
 	}
 	if (isset($_POST["cleardatabase"])) {
-		WT_DB::exec("DELETE FROM {$TBLPREFIX}placelocation WHERE 1=1");
+		WT_DB::exec("DELETE FROM ##placelocation WHERE 1=1");
 	}
 	if (!empty($_FILES["placesfile"]["tmp_name"])) {
 		$lines = file($_FILES["placesfile"]["tmp_name"]);
@@ -455,7 +448,7 @@ if ($action=="ImportFile2") {
 				$escparent = "Unknown";
 			}
 			$row=
-				WT_DB::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom, pl_icon FROM {$TBLPREFIX}placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
+				WT_DB::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom, pl_icon FROM ##placelocation WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 				->execute(array($i, $parent_id, $escparent))
 				->fetchOneRow();
 			if (empty($row)) {       // this name does not yet exist: create entry
@@ -469,7 +462,7 @@ if ($action=="ImportFile2") {
 						$zoomlevel = $GOOGLEMAP_MAX_ZOOM;
 					}
 					if (($place["lati"] == "0") || ($place["long"] == "0") || (($i+1) < count($parent))) {
-						WT_DB::prepare("INSERT INTO {$TBLPREFIX}placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?)")
+						WT_DB::prepare("INSERT INTO ##placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?)")
 							->execute(array($highestIndex, $parent_id, $i, $escparent, $zoomlevel, $place["icon"]));
 					} else {
 						//delete leading zero
@@ -485,7 +478,7 @@ if ($action=="ImportFile2") {
 						} elseif ($pl_long < 0) {
 							$place["long"] = "W".abs($pl_long);
 						}
-						WT_DB::prepare("INSERT INTO {$TBLPREFIX}placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")
+						WT_DB::prepare("INSERT INTO ##placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")
 							->execute(array($highestIndex, $parent_id, $i, $escparent, $place["long"], $place["lati"], $zoomlevel, $place["icon"]));
 					}
 					$parent_id = $highestIndex;
@@ -493,15 +486,15 @@ if ($action=="ImportFile2") {
 			} else {
 				$parent_id = $row->pl_id;
 				if ((isset($_POST["overwritedata"])) && ($i+1 == count($parent))) {
-					WT_DB::prepare("UPDATE {$TBLPREFIX}placelocation SET pl_lati=?, pl_long=?, pl_zoom=?, pl_icon=? WHERE pl_id=?")
+					WT_DB::prepare("UPDATE ##placelocation SET pl_lati=?, pl_long=?, pl_zoom=?, pl_icon=? WHERE pl_id=?")
 						->execute(array($place["lati"], $place["long"], $place["zoom"], $place["icon"], $parent_id));
 				} else {
 					if ((($row->pl_long == "0") || ($row->pl_long == null)) && (($row->pl_lati == "0") || ($row->pl_lati == null))) {
-						WT_DB::prepare("UPDATE {$TBLPREFIX}placelocation SET pl_lati=?, pl_long=? WHERE pl_id=?")
+						WT_DB::prepare("UPDATE ##placelocation SET pl_lati=?, pl_long=? WHERE pl_id=?")
 							->execute(array($place["lati"], $place["long"], $parent_id));
 					}
 					if (empty($row->pl_icon) && !empty($place['icon'])) {
-						WT_DB::prepare("UPDATE {$TBLPREFIX}placelocation SET pl_icon=? WHERE pl_id=?")
+						WT_DB::prepare("UPDATE ##placelocation SET pl_icon=? WHERE pl_id=?")
 							->execute(array($place["icon"], $parent_id));
 					}
 				}
@@ -513,12 +506,12 @@ if ($action=="ImportFile2") {
 
 if ($action=="DeleteRecord") {
 	$exists=
-		WT_DB::prepare("SELECT 1 FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=?")
+		WT_DB::prepare("SELECT 1 FROM ##placelocation WHERE pl_parent_id=?")
 		->execute(array($deleteRecord))
 		->fetchOne();
 	
 	if (!$exists) {
-		WT_DB::prepare("DELETE FROM {$TBLPREFIX}placelocation WHERE pl_id=?")
+		WT_DB::prepare("DELETE FROM ##placelocation WHERE pl_id=?")
 			->execute(array($deleteRecord));
 	} else {
 		echo "<table class=\"facts_table\"><tr><td class=\"optionbox\">".i18n::translate('Location not removed: this location contains sub-locations')."</td></tr></table>";
@@ -619,7 +612,7 @@ foreach ($placelist as $place) {
 	echo "</td>";
 	echo "<td class=\"optionbox\"><a href=\"javascript:;\" onclick=\"edit_place_location({$place['place_id']});return false;\">", i18n::translate('Edit'), "</a></td>";
 	$noRows=
-		WT_DB::prepare("SELECT COUNT(pl_id) FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=?")
+		WT_DB::prepare("SELECT COUNT(pl_id) FROM ##placelocation WHERE pl_parent_id=?")
 		->execute(array($place["place_id"]))
 		->fetchOne();
 	if ($noRows==0) { ?>
diff --git a/modules/googlemap/places_edit.php b/modules/googlemap/places_edit.php
index 9d537ed132..44b0789b48 100644
--- a/modules/googlemap/places_edit.php
+++ b/modules/googlemap/places_edit.php
@@ -35,7 +35,7 @@ if (!defined('WT_WEBTREES')) {
 require WT_ROOT.'modules/googlemap/defaultconfig.php';
 require WT_ROOT.'includes/functions/functions_edit.php';
 
-global $TBLPREFIX, $EDIT_AUTOCLOSE;
+global $EDIT_AUTOCLOSE;
 $action=safe_REQUEST($_REQUEST, 'action');
 if (isset($_REQUEST['placeid'])) $placeid = $_REQUEST['placeid'];
 if (isset($_REQUEST['place_name'])) $place_name = $_REQUEST['place_name'];
@@ -72,10 +72,8 @@ function showchanges() {
 // e.g. array(0=>"Top Level", 16=>"England", 19=>"London", 217=>"Westminster");
 // NB This function exists in both places.php and places_edit.php
 function place_id_to_hierarchy($id) {
-	global $TBLPREFIX;
-
 	$statement=
-		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM {$TBLPREFIX}placelocation WHERE pl_id=?");
+		WT_DB::prepare("SELECT pl_parent_id, pl_place FROM ##placelocation WHERE pl_id=?");
 	$arr=array();
 	while ($id!=0) {
 		$row=$statement->execute(array($id))->fetchOneRow();
@@ -87,9 +85,7 @@ function place_id_to_hierarchy($id) {
 
 // NB This function exists in both places.php and places_edit.php
 function getHighestIndex() {
-	global $TBLPREFIX;
-
-	return (int)WT_DB::prepare("SELECT MAX(pl_id) FROM {$TBLPREFIX}placelocation")->fetchOne();
+	return (int)WT_DB::prepare("SELECT MAX(pl_id) FROM ##placelocation")->fetchOne();
 }
 
 $where_am_i=place_id_to_hierarchy($placeid);
@@ -97,7 +93,7 @@ $level=count($where_am_i);
 
 if ($action=='addrecord' && WT_USER_IS_ADMIN) {
 	$statement=
-		WT_DB::prepare("INSERT INTO {$TBLPREFIX}placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
+		WT_DB::prepare("INSERT INTO ##placelocation (pl_id, pl_parent_id, pl_level, pl_place, pl_long, pl_lati, pl_zoom, pl_icon) VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
 
 	if (($_POST['LONG_CONTROL'] == '') || ($_POST['NEW_PLACE_LONG'] == '') || ($_POST['NEW_PLACE_LATI'] == '')) {
 		$statement->execute(array(getHighestIndex()+1, $placeid, $level, stripLRMRLM($_POST['NEW_PLACE_NAME']), null, null, $_POST['NEW_ZOOM_FACTOR'], $_POST['icon']));
@@ -115,7 +111,7 @@ if ($action=='addrecord' && WT_USER_IS_ADMIN) {
 
 if ($action=='updaterecord' && WT_USER_IS_ADMIN) {
 	$statement=
-		WT_DB::prepare("UPDATE {$TBLPREFIX}placelocation SET pl_place=?, pl_lati=?, pl_long=?, pl_zoom=?, pl_icon=? WHERE pl_id=?");
+		WT_DB::prepare("UPDATE ##placelocation SET pl_place=?, pl_lati=?, pl_long=?, pl_zoom=?, pl_icon=? WHERE pl_id=?");
 
 	if (($_POST['LONG_CONTROL'] == '') || ($_POST['NEW_PLACE_LONG'] == '') || ($_POST['NEW_PLACE_LATI'] == '')) {
 		$statement->execute(array(stripLRMRLM($_POST['NEW_PLACE_NAME']), null, null, $_POST['NEW_ZOOM_FACTOR'], $_POST['icon'], $placeid));
@@ -134,7 +130,7 @@ if ($action=='updaterecord' && WT_USER_IS_ADMIN) {
 if ($action=="update") {
 	// --- find the place in the file
 	$row=
-		WT_DB::prepare("SELECT pl_place, pl_lati, pl_long, pl_icon, pl_parent_id, pl_level, pl_zoom FROM {$TBLPREFIX}placelocation WHERE pl_id=?")
+		WT_DB::prepare("SELECT pl_place, pl_lati, pl_long, pl_icon, pl_parent_id, pl_level, pl_zoom FROM ##placelocation WHERE pl_id=?")
 		->execute(array($placeid))
 		->fetchOneRow();
 	$place_name = $row->pl_place;
@@ -162,7 +158,7 @@ if ($action=="update") {
 
 	do {
 		$row=
-			WT_DB::prepare("SELECT pl_lati, pl_long, pl_parent_id, pl_zoom FROM {$TBLPREFIX}placelocation WHERE pl_id=?")
+			WT_DB::prepare("SELECT pl_lati, pl_long, pl_parent_id, pl_zoom FROM ##placelocation WHERE pl_id=?")
 			->execute(array($parent_id))
 			->fetchOneRow();
 		if (!$row) {
@@ -196,7 +192,7 @@ if ($action=="add") {
 		$parent_id=$placeid;
 		do {
 			$row=
-				WT_DB::prepare("SELECT pl_lati, pl_long, pl_parent_id, pl_zoom, pl_level FROM {$TBLPREFIX}placelocation WHERE pl_id=?")
+				WT_DB::prepare("SELECT pl_lati, pl_long, pl_parent_id, pl_zoom, pl_level FROM ##placelocation WHERE pl_id=?")
 				->execute(array($parent_id))
 				->fetchOneRow();
 			if ($row->pl_lati!==null && $row->pl_long!==null) {
@@ -496,7 +492,7 @@ if ($action=="add") {
 			childicon.infoWindowAnchor = new GPoint(5, 1);
 <?php
 			$rows=
-				WT_DB::prepare("SELECT pl_place, pl_lati, pl_long, pl_icon FROM {$TBLPREFIX}placelocation WHERE pl_parent_id=?")
+				WT_DB::prepare("SELECT pl_place, pl_lati, pl_long, pl_icon FROM ##placelocation WHERE pl_parent_id=?")
 				->execute(array($placeid))
 				->fetchAll();
 			$i = 0;
diff --git a/modules/individuals/module.php b/modules/individuals/module.php
index 13dfada898..1c4758c6f3 100644
--- a/modules/individuals/module.php
+++ b/modules/individuals/module.php
@@ -207,11 +207,10 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 
 	public function search($query) {
-		global $TBLPREFIX;
 		if (strlen($query)<2) return '';
 		$sql=
 		"SELECT ? AS type, i_id AS xref, i_file AS ged_id, i_gedcom AS gedrec, i_isdead, i_sex".
-		" FROM {$TBLPREFIX}individuals, {$TBLPREFIX}name".
+		" FROM ##individuals, ##name".
 		" WHERE (i_id LIKE ? OR n_sort LIKE ?)".
 		" AND i_id=n_id AND i_file=n_file AND i_file=?".
 		" ORDER BY n_sort";
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php
index ff19203131..2256b29501 100644
--- a/modules/lightbox/functions/lightbox_print_media.php
+++ b/modules/lightbox/functions/lightbox_print_media.php
@@ -51,7 +51,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 	$n=1;
 	$fn=1;
 
-	global $MULTI_MEDIA, $TBLPREFIX, $SHOW_ID_NUMBERS, $MEDIA_EXTERNAL;
+	global $MULTI_MEDIA, $SHOW_ID_NUMBERS, $MEDIA_EXTERNAL;
 	global $GEDCOM, $MEDIATYPE;
 	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION;
 
@@ -111,7 +111,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 
 	// Get the related media items
 	$sqlmm = "SELECT DISTINCT ";
-	$sqlmm .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM ".$TBLPREFIX."media, ".$TBLPREFIX."media_mapping where ";
+	$sqlmm .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM ##media, ##media_mapping where ";
 	$sqlmm .= "mm_gid IN (";
 	$vars=array();
 	foreach ($ids as $id) {
@@ -280,7 +280,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 		
 		// Firstly, get count of Items in Database for this Individual
 		$indiobjs = "SELECT DISTINCT ";
-		$indiobjs .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM {$TBLPREFIX}media, {$TBLPREFIX}media_mapping where ";
+		$indiobjs .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM ##media, ##media_mapping where ";
 		$indiobjs .= "mm_gid=? ";
 		$indiobjs .= "AND mm_gedfile=? AND mm_media=m_media AND mm_gedfile=m_gedfile ";
 		$vars2=array($pid, WT_GED_ID);
diff --git a/modules/review_changes/module.php b/modules/review_changes/module.php
index bb74da0063..4b267d7109 100644
--- a/modules/review_changes/module.php
+++ b/modules/review_changes/module.php
@@ -45,11 +45,11 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id) {
-		global $ctype, $QUERY_STRING, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $SHOW_SOURCES, $WEBTREES_EMAIL, $TBLPREFIX;
+		global $ctype, $QUERY_STRING, $WT_IMAGE_DIR, $WT_IMAGES, $TEXT_DIRECTION, $SHOW_SOURCES, $WEBTREES_EMAIL;
 
 		$changes=WT_DB::prepare(
 			"SELECT 1".
-			" FROM {$TBLPREFIX}change".
+			" FROM ##change".
 			" WHERE status='pending'".
 			" LIMIT 1"
 		)->fetchOne();
@@ -112,7 +112,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 				}
 				$changes=WT_DB::prepare(
 					"SELECT xref".
-					" FROM  {$TBLPREFIX}change".
+					" FROM  ##change".
 					" WHERE status='pending'".
 					" AND   gedcom_id=?".
 					" GROUP BY xref"
diff --git a/modules/sitemap/index.php b/modules/sitemap/index.php
index f21286dd92..2b0a1be83a 100644
--- a/modules/sitemap/index.php
+++ b/modules/sitemap/index.php
@@ -46,7 +46,7 @@ if (!WT_USER_IS_ADMIN) {
 	}
 }
 
-global $TBLPREFIX, $GEDCOM;
+global $GEDCOM;
 
 $action				= safe_REQUEST($_REQUEST, 'action', WT_REGEX_XREF);
 $welcome			= safe_REQUEST($_REQUEST, 'welcome', WT_REGEX_XREF);
@@ -96,7 +96,7 @@ if ($action=="sendFiles") {
 	$_SESSION["org_user"]=$_SESSION["wt_user"];
 	$_SESSION["wt_user"]='#SiteMap#';
 	if (isset($indi_rec)) {
-		$statement=WT_DB::prepare("SELECT i_id, i_gedcom FROM {$TBLPREFIX}individuals WHERE i_file=?")->execute(array($index));
+		$statement=WT_DB::prepare("SELECT i_id, i_gedcom FROM ##individuals WHERE i_file=?")->execute(array($index));
 		while ($row=$statement->fetch(PDO::FETCH_NUM)) {
 			if ($no_private_links) {
 				if (displayDetailsById($row[0], "INDI", true)) {
@@ -124,7 +124,7 @@ if ($action=="sendFiles") {
 	}
 
 	if (isset($fam_rec)) {
-		$statement=WT_DB::prepare("SELECT f_id, f_gedcom FROM {$TBLPREFIX}families WHERE f_file=?")->execute(array($index));
+		$statement=WT_DB::prepare("SELECT f_id, f_gedcom FROM ##families WHERE f_file=?")->execute(array($index));
 		while ($row=$statement->fetch(PDO::FETCH_NUM)) {
 			if ($no_private_links) {
 				if (displayDetailsById($row[0], "FAM", true)) {
diff --git a/modules/stories/module.php b/modules/stories/module.php
index 04ee2703fe..dcec1bd88a 100644
--- a/modules/stories/module.php
+++ b/modules/stories/module.php
@@ -96,12 +96,10 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 
 	// Implement class WT_Module_Tab
 	public function getTabContent() {
-		global $TBLPREFIX;
-
 		$block_ids=
 			WT_DB::prepare(
 				"SELECT block_id".
-				" FROM {$TBLPREFIX}block".
+				" FROM ##block".
 				" WHERE module_name=?".
 				" AND xref=?".
 				" AND gedcom_id=?"
@@ -144,7 +142,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 
 	// Action from the configuration page
 	private function edit() {
-		global $TBLPREFIX, $TEXT_DIRECTION;
+		global $TEXT_DIRECTION;
 
 		require_once WT_ROOT.'includes/functions/functions_edit.php';
 
@@ -152,11 +150,11 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 			$block_id=safe_POST('block_id');
 			if ($block_id) {
 				WT_DB::prepare(
-					"UPDATE {$TBLPREFIX}block SET gedcom_id=?, xref=? WHERE block_id=?"
+					"UPDATE ##block SET gedcom_id=?, xref=? WHERE block_id=?"
 				)->execute(array(safe_POST('gedcom_id'), safe_POST('xref'), $block_id));
 			} else {
 				WT_DB::prepare(
-					"INSERT INTO {$TBLPREFIX}block (gedcom_id, xref, module_name, block_order) VALUES (?, ?, ?, ?)"
+					"INSERT INTO ##block (gedcom_id, xref, module_name, block_order) VALUES (?, ?, ?, ?)"
 				)->execute(array(
 					safe_POST('gedcom_id', array_keys(get_all_gedcoms())),
 					safe_POST('xref'),
@@ -183,10 +181,10 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 				print_header(i18n::translate('Edit story'));
 				$body=get_block_setting($block_id, 'body');
 				$gedcom_id=WT_DB::prepare(
-					"SELECT gedcom_id FROM {$TBLPREFIX}block WHERE block_id=?"
+					"SELECT gedcom_id FROM ##block WHERE block_id=?"
 				)->execute(array($block_id))->fetchOne();
 				$xref=WT_DB::prepare(
-					"SELECT xref FROM {$TBLPREFIX}block WHERE block_id=?"
+					"SELECT xref FROM ##block WHERE block_id=?"
 				)->execute(array($block_id))->fetchOne();
 			} else {
 				print_header(i18n::translate('Add story'));
@@ -229,31 +227,29 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 	}
 
 	private function delete() {
-		global $TBLPREFIX;
-
 		$block_id=safe_GET('block_id');
 
 		$block_order=WT_DB::prepare(
-			"SELECT block_order FROM {$TBLPREFIX}block WHERE block_id=?"
+			"SELECT block_order FROM ##block WHERE block_id=?"
 		)->execute(array($block_id))->fetchOne();
 
 		WT_DB::prepare(
-			"DELETE FROM {$TBLPREFIX}block_setting WHERE block_id=?"
+			"DELETE FROM ##block_setting WHERE block_id=?"
 		)->execute(array($block_id));
 
 		WT_DB::prepare(
-			"DELETE FROM {$TBLPREFIX}block WHERE block_id=?"
+			"DELETE FROM ##block WHERE block_id=?"
 		)->execute(array($block_id));
 	}
 
 	private function config() {
-		global $TBLPREFIX, $WT_IMAGES, $WT_IMAGE_DIR;
+		global $WT_IMAGES, $WT_IMAGE_DIR;
 
 		print_header($this->getTitle());
 
 		$stories=WT_DB::prepare(
 			"SELECT block_id, xref".
-			" FROM {$TBLPREFIX}block b".
+			" FROM ##block b".
 			" WHERE module_name=?".
 			" AND gedcom_id=?".
 			" ORDER BY xref"
diff --git a/modules/top10_pageviews/module.php b/modules/top10_pageviews/module.php
index af4b2da86e..07cf8c7443 100644
--- a/modules/top10_pageviews/module.php
+++ b/modules/top10_pageviews/module.php
@@ -45,7 +45,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 
 	// Implement class WT_Module_Block
 	public function getBlock($block_id) {
-		global $ctype, $TBLPREFIX, $INDEX_DIRECTORY, $WT_IMAGES, $WT_IMAGE_DIR, $SHOW_COUNTER, $SHOW_SOURCES, $TEXT_DIRECTION;
+		global $ctype, $INDEX_DIRECTORY, $WT_IMAGES, $WT_IMAGE_DIR, $SHOW_COUNTER, $SHOW_SOURCES, $TEXT_DIRECTION;
 
 		$count_placement=get_block_setting($block_id, 'count_placement', 'before');
 		$num=get_block_setting($block_id, 'num', 10);
@@ -70,7 +70,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 			// load the lines from the file
 			$top10=WT_DB::prepareLimit(
 				"SELECT page_parameter, page_count".
-				" FROM {$TBLPREFIX}hit_counter".
+				" FROM ##hit_counter".
 				" WHERE gedcom_id=? AND page_name IN ('individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php')".
 				" ORDER BY page_count DESC",
 				$num
diff --git a/modules/user_blog/db_schema/db_schema_0_1.php b/modules/user_blog/db_schema/db_schema_0_1.php
index 3674cb9fa8..da66bc148d 100644
--- a/modules/user_blog/db_schema/db_schema_0_1.php
+++ b/modules/user_blog/db_schema/db_schema_0_1.php
@@ -43,7 +43,7 @@ exit;
 define('WT_FV_DB_SCHEMA_0_1', '');
 
 WT_DB::exec(
-	"CREATE TABLE IF NOT EXISTS {$TBLPREFIX}news (".
+	"CREATE TABLE IF NOT EXISTS ##news (".
 	" n_id       INTEGER AUTO_INCREMENT NOT NULL,".
 	" n_username VARCHAR(100)           NOT NULL,".
 	" n_date     INTEGER                NOT NULL,".
diff --git a/modules/user_favorites/db_schema/db_schema_0_1.php b/modules/user_favorites/db_schema/db_schema_0_1.php
index d1ddd71e2b..bb8ae1b7cb 100644
--- a/modules/user_favorites/db_schema/db_schema_0_1.php
+++ b/modules/user_favorites/db_schema/db_schema_0_1.php
@@ -43,7 +43,7 @@ exit;
 define('WT_FV_DB_SCHEMA_0_1', '');
 
 WT_DB::exec(
-	"CREATE TABLE IF NOT EXISTS {$TBLPREFIX}favorites (".
+	"CREATE TABLE IF NOT EXISTS ##favorites (".
 	" fv_id       INTEGER AUTO_INCREMENT NOT NULL,".
  	" fv_username VARCHAR(32)            NOT NULL,".
 	" fv_gid      VARCHAR(20)                NULL,".
diff --git a/modules/user_favorites/module.php b/modules/user_favorites/module.php
index 065d761b5f..9d6f38adf9 100644
--- a/modules/user_favorites/module.php
+++ b/modules/user_favorites/module.php
@@ -309,10 +309,8 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param int $fv_id	the id of the favorite to delete
 	 */
 	public static function deleteFavorite($fv_id) {
-		global $TBLPREFIX;
-	
 		return (bool)
-			WT_DB::prepare("DELETE FROM {$TBLPREFIX}favorites WHERE fv_id=?")
+			WT_DB::prepare("DELETE FROM ##favorites WHERE fv_id=?")
 			->execute(array($fv_id));
 	}
 
@@ -321,14 +319,12 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param array $favorite	the favorite array of the favorite to add
 	 */
 	public static function addFavorite($favorite) {
-		global $TBLPREFIX;
-
 		// -- make sure a favorite is added
 		if (empty($favorite["gid"]) && empty($favorite["url"]))
 			return false;
 
 		//-- make sure this is not a duplicate entry
-		$sql = "SELECT 1 FROM {$TBLPREFIX}favorites WHERE";
+		$sql = "SELECT 1 FROM ##favorites WHERE";
 		if (!empty($favorite["gid"])) {
 			$sql.=" fv_gid=?";
 			$vars=array($favorite["gid"]);
@@ -346,7 +342,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	
 		//-- add the favorite to the database
 		return (bool)
-			WT_DB::prepare("INSERT INTO {$TBLPREFIX}favorites (fv_id, fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,? ,?)")
+			WT_DB::prepare("INSERT INTO ##favorites (fv_id, fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,? ,?)")
 				->execute(array(get_next_id("favorites", "fv_id"), $favorite["username"], $favorite["gid"], $favorite["type"], $favorite["file"], $favorite["url"], $favorite["title"], $favorite["note"]));
 	}
 
@@ -356,10 +352,8 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	 * @param string $username		the username to get the favorites for
 	 */
 	public static function getUserFavorites($username) {
-		global $TBLPREFIX;
-	
 		$rows=
-			WT_DB::prepare("SELECT * FROM {$TBLPREFIX}favorites WHERE fv_username=?")
+			WT_DB::prepare("SELECT * FROM ##favorites WHERE fv_username=?")
 			->execute(array($username))
 			->fetchAll();