--- ./masquerade.module	2011-02-09 09:22:59.000000000 +0100
+++ ./masquerade.module.fixed	2011-02-09 09:22:59.000000000 +0100
@@ -51,7 +51,7 @@ function masquerade_init() {
 	$uid = db_query("SELECT uid_from FROM {masquerade} WHERE sid = :sid AND uid_as = :uid_as", array(
 				':sid' => session_id(),
 				':uid_as' => $user->uid,
-			))->fetchCol();
+			))->fetchColumn();
 
 	// We are using identical operator (===) instead of equal (==) because if
 	// $uid === 0 we want to store the session variable. If there's no record in
@@ -202,7 +202,7 @@ function masquerade_menu_access($type, $
 			break;
 		case 'user':
 			global $user;
-			return db_query("SELECT TRUE FROM {masquerade_users} WHERE uid_from = :uid_from", array(':uid_from' => $user->uid))->fetchCol();
+			return db_query("SELECT TRUE FROM {masquerade_users} WHERE uid_from = :uid_from", array(':uid_from' => $user->uid))->fetchColumn();
 			break;
 		case 'switch':
 			$switch_to_account = FALSE;
@@ -215,7 +215,7 @@ function masquerade_menu_access($type, $
 				$switch_to_account = db_query("SELECT TRUE FROM {masquerade_users} WHERE uid_from = :uid_from AND uid_to = :uid_to", array(
 							':uid_from' => $user->uid,
 							':uid_to' => $account->uid
-						))->fetchCol();
+						))->fetchColumn();
 			}
 			return!isset($_SESSION['masquerading']) && (user_access('masquerade as user') || user_access('masquerade as admin') || $switch_to_account);
 			break;
@@ -374,7 +374,7 @@ function masquerade_form_user_profile_fo
 	);
 	$edit_user = $form['#user'];
 	$uids = db_query("SELECT uid_to FROM {masquerade_users} WHERE uid_from = :uid_from", array(':uid_from' => $edit_user->uid))
-					->fetchCol();
+					->fetchColumn();
 	$users = user_load_multiple($uids);
 	$masquerade_users = array();
 	foreach ($users as $uid => $account) {
@@ -514,7 +514,7 @@ function masquerade_block_1() {
 
 		// Add in user-specific switches.
 		$results = db_query("SELECT uid_to FROM {masquerade_users} WHERE uid_from = :uid_from", array(':uid_from' => $user->uid));
-		while ($uid_to = $results->fetchCol()) {
+		while ($uid_to = $results->fetchColumn()) {
 			// Avoid dupes if an account has been added to quick switches and {masquerade_users}.
 			if (!in_array($uid_to, $masquerade_switches)) {
 				$masquerade_switches[] = $uid_to;
@@ -725,7 +725,7 @@ function masquerade_switch_user($uid) {
 				':uid_from' => $user->uid,
 				':uid_to' => $new_user->uid,
 			));
-	if (!user_access($perm) && !isset($_SESSION['masquerading']) && !$results->fetchCol()) {
+	if (!user_access($perm) && !isset($_SESSION['masquerading']) && !$results->fetchColumn()) {
 		watchdog('masquerade', 'This user requires administrative permissions to switch to the user %user.', array('%user' => $new_user->name), WATCHDOG_ERROR);
 		return FALSE;
 	}
@@ -782,7 +782,7 @@ function masquerade_switch_back() {
 	$uid = db_query("SELECT m.uid_from FROM {masquerade} m WHERE m.sid = :sid AND m.uid_as = :uid_as ", array(
 				':sid' => session_id(),
 				':uid_as' => $user->uid,
-			))->fetchCol();
+			))->fetchColumn();
 	// erase record
 	$conditions = db_or();
 	$conditions->condition('sid', session_id());