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.4' into 4.4-master-2014-06-30-11-58-01
[civicrm-core.git]
/
CRM
/
Core
/
Config.php
diff --git
a/CRM/Core/Config.php
b/CRM/Core/Config.php
index 1510711b199c3aff04147cd54ce9ffd05015b826..72553ed90eec137d449a46ea199fd880713da50e 100644
(file)
--- a/
CRM/Core/Config.php
+++ b/
CRM/Core/Config.php
@@
-85,6
+85,11
@@
class CRM_Core_Config extends CRM_Core_Config_Variables {
*/
public $userSystem = NULL;
+ /**
+ * @var CRM_Core_Permission_Base
+ */
+ public $userPermissionClass;
+
/**
* The root directory where Smarty should store compiled files
*