From 27591b68861f0e13f61fe498619fd6a376cef423 Mon Sep 17 00:00:00 2001 From: Eileen Date: Wed, 16 Oct 2013 14:54:28 +1300 Subject: [PATCH] CRM-13598 d6 - use drupal mechanism to identify table prefixing ---------------------------------------- * CRM-13598: User drupal {users} rather than storing name of drupal user table http://issues.civicrm.org/jira/browse/CRM-13598 --- CRM/Utils/System/Drupal6.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php index 54a36ba44b..ad81d42f84 100644 --- a/CRM/Utils/System/Drupal6.php +++ b/CRM/Utils/System/Drupal6.php @@ -171,7 +171,7 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase { $sql = " SELECT name, mail - FROM {$config->userFrameworkUsersTableName} + FROM {users} WHERE (LOWER(name) = LOWER('$name')) OR (LOWER(mail) = LOWER('$email'))"; $db_cms = DB::connect($config->userFrameworkDSN); @@ -528,7 +528,7 @@ SELECT name, mail $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower'; $dbpassword = md5($password); $name = $dbDrupal->escapeSimple($strtolower($name)); - $sql = 'SELECT u.* FROM ' . $config->userFrameworkUsersTableName . " u WHERE LOWER(u.name) = '$name' AND u.pass = '$dbpassword' AND u.status = 1"; + $sql = "SELECT u.* FROM {users} u WHERE LOWER(u.name) = '$name' AND u.pass = '$dbpassword' AND u.status = 1"; $query = $dbDrupal->query($sql); $user = NULL; -- 2.25.1