Merge branch 'dev'

1 files changed, 0 insertions, 37 deletions

diff --git a/include/features.php b/include/features.php
index 7e2c9a3ac..5479be122 100644
--- a/include/features.php
+++ b/include/features.php
@@ -81,24 +81,6 @@ function get_features($filtered = true, $level = (-1)) {
 				get_config('feature_lock','profile_export'),
 				feature_level('profile_export',3),
 			],
-
-			[
-				'webpages',            
-				t('Web Pages'),              
-				t('Provide managed web pages on your channel'),
-				false,
-				get_config('feature_lock','webpages'),
-				feature_level('webpages',3),
-			],
-
-			[
-				'wiki',            
-				t('Wiki'),              
-				t('Provide a wiki for your channel'),
-				false,
-				get_config('feature_lock','wiki'),
-				feature_level('wiki',2),
-			],
 /*
 			[
 				'hide_rating',       
@@ -119,15 +101,6 @@ function get_features($filtered = true, $level = (-1)) {
 			],
 
 			[
-				'articles',       
-				t('Articles'),          
-				t('Create interactive articles'),
-				false,
-				get_config('feature_lock','articles'),
-				feature_level('articles',1),
-			],
-
-			[
 				'nav_channel_select',  
 				t('Navigation Channel Select'), 
 				t('Change channels directly from within the navigation dropdown menu'),
@@ -146,16 +119,6 @@ function get_features($filtered = true, $level = (-1)) {
 			],
 
 			[
-				'ajaxchat',       
-				t('Access Controlled Chatrooms'),          
-				t('Provide chatrooms and chat services with access control.'),
-				true,
-				get_config('feature_lock','ajaxchat'),
-				feature_level('ajaxchat',1),
-			],
-
-
-			[
 				'smart_birthdays',       
 				t('Smart Birthdays'),          
 				t('Make birthday events timezone aware in case your friends are scattered across the planet.'),