projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09
[civicrm-core.git]
/
CRM
/
Utils
/
System.php
diff --git
a/CRM/Utils/System.php
b/CRM/Utils/System.php
index 8272c125e2a5c38b728ce3cd6d48c8181b4615e4..a9d1e3a901a7ce5bd1f2c2551b916c4efb3dab6c 100644
(file)
--- a/
CRM/Utils/System.php
+++ b/
CRM/Utils/System.php
@@
-642,7
+642,7
@@
class CRM_Utils_System {
/**
* Authenticate the user against the uf db.
*
/**
* Authenticate the user against the uf db.
*
- * In case of succesful authentication, returns an array consisting of
+ * In case of succes
s
ful authentication, returns an array consisting of
* (contactID, ufID, unique string). Returns FALSE if authentication is
* unsuccessful.
*
* (contactID, ufID, unique string). Returns FALSE if authentication is
* unsuccessful.
*