Merge branch 2.2RC2.2

1 files changed, 18 insertions, 0 deletions

diff --git a/include/features.php b/include/features.php
index 1ccdbf015..0fc6fbc1d 100644
--- a/include/features.php
+++ b/include/features.php
@@ -149,6 +149,15 @@ function get_features($filtered = true) {
 			],
 
 			[
+				'permcats',       
+				t('Permission Groups'),          
+				t('Provide alternate connection permission roles.'),
+				false,
+				get_config('feature_lock','permcats'),
+				feature_level('permcats',2),
+			],
+
+			[
 				'smart_birthdays',       
 				t('Smart Birthdays'),          
 				t('Make birthday events timezone aware in case your friends are scattered across the planet.'),
@@ -157,6 +166,15 @@ function get_features($filtered = true) {
 				feature_level('smart_birthdays',2),
 			],
 
+			[
+				'event_tz_select',       
+				t('Event Timezone Selection'),          
+				t('Allow event creation in timezones other than your own.'),
+				false,
+				get_config('feature_lock','event_tz_select'),
+				feature_level('event_tz_select',2),
+			],
+
 			[ 
 				'advanced_dirsearch', 
 				t('Advanced Directory Search'),