From b78953097abcd9226e02cd34ada0bc84a5232ce7 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 18 Dec 2001 05:53:31 +0000
Subject: [PATCH] globals

---
 .../inc/hook_admin_deleteaccount.inc.php        | 17 +++++++----------
 preferences/inc/hook_config.inc.php             |  6 +-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/preferences/inc/hook_admin_deleteaccount.inc.php b/preferences/inc/hook_admin_deleteaccount.inc.php
index a754c9795e..f665b3fa15 100755
--- a/preferences/inc/hook_admin_deleteaccount.inc.php
+++ b/preferences/inc/hook_admin_deleteaccount.inc.php
@@ -9,16 +9,13 @@
   *  Free Software Foundation; either version 2 of the License, or (at your  *
   *  option) any later version.                                              *
   \**************************************************************************/
-	/* $Id$ */
-	
-	// Delete all records for a user
-	if (floor(phpversion()) == 4)
-	{
-		global $phpgw, $account_id;
-	}
 
+  /* $Id$ */
+
+	// Delete all records for a user
 	$table_locks = Array('phpgw_preferences');
-	$phpgw->db->lock($table_locks);
-	$phpgw->db->query('DELETE FROM phpgw_preferences WHERE preference_owner='.$account_id,__LINE__,__FILE__);
-	$phpgw->db->unlock();
+
+	$GLOBALS['phpgw']->db->lock($table_locks);
+	$GLOBALS['phpgw']->db->query('DELETE FROM phpgw_preferences WHERE preference_owner='.$account_id,__LINE__,__FILE__);
+	$GLOBALS['phpgw']->db->unlock();
 ?>
diff --git a/preferences/inc/hook_config.inc.php b/preferences/inc/hook_config.inc.php
index 5634a903d5..d2c97ef8ab 100644
--- a/preferences/inc/hook_config.inc.php
+++ b/preferences/inc/hook_config.inc.php
@@ -12,11 +12,8 @@
 
   /* $Id$ */
 
-
 	function country_set($config)
 	{
-		global $phpgw;
-
 		$country  = array(
 			'user_choice'  => 'Users Choice',
 			'force_select' => 'Force Selectbox'
@@ -38,5 +35,4 @@
 		}
 		return $out;
 	}
-
-?>
\ No newline at end of file
+?>