projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15333 from civicrm/5.18
[civicrm-core.git]
/
CRM
/
Utils
/
System
/
Drupal6.php
diff --git
a/CRM/Utils/System/Drupal6.php
b/CRM/Utils/System/Drupal6.php
index 402452fa38584ebfed9ba65216eb00e1e55605b3..af566e5d2a786c38a9069d18c8fb838e9881fda0 100644
(file)
--- a/
CRM/Utils/System/Drupal6.php
+++ b/
CRM/Utils/System/Drupal6.php
@@
-391,7
+391,7
@@
class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase {
* Determine the native ID of the CMS user.
*
* @param string $username
* Determine the native ID of the CMS user.
*
* @param string $username
- * @return int|
NULL
+ * @return int|
null
*/
public function getUfId($username) {
$user = user_load(['name' => $username]);
*/
public function getUfId($username) {
$user = user_load(['name' => $username]);
@@
-815,9
+815,6
@@
class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase {
else {
$contactMatching++;
}
else {
$contactMatching++;
}
- if (is_object($match)) {
- $match->free();
- }
}
return [
}
return [