X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeatures.php;h=64ab932d00cef7bc8cd0491ae1cd6dadde11dca5;hb=d49325d177cf03b97df250ca3cb081421c541049;hp=87a9b46d5ab71dbd5e995cfb65fff58d7d45d7c3;hpb=fe5705e5473c358359e6c78d596d4ad3d866cc26;p=friendica.git

diff --git a/include/features.php b/include/features.php
index 87a9b46d5a..64ab932d00 100644
--- a/include/features.php
+++ b/include/features.php
@@ -7,20 +7,27 @@
 
 /**
  * @brief check if feature is enabled
- * 
+ *
  * @return boolean
  */
-function feature_enabled($uid,$feature) {
-
-	$x = get_config('feature_lock',$feature);
-	if($x === false) {
-		$x = get_pconfig($uid,'feature',$feature);
-		if($x === false) {
-			$x = get_config('feature',$feature);
-			if($x === false)
+function feature_enabled($uid, $feature) {
+
+	if (($feature == 'richtext') AND !get_app()->theme_richtext_editor) {
+		return false;
+	}
+
+	$x = get_config('feature_lock', $feature);
+
+	if ($x === false) {
+		$x = get_pconfig($uid, 'feature', $feature);
+		if ($x === false) {
+			$x = get_config('feature', $feature);
+			if ($x === false) {
 				$x = get_feature_default($feature);
+			}
 		}
 	}
+
 	$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
 	call_hooks('feature_enabled',$arr);
 	return($arr['enabled']);
@@ -64,6 +71,7 @@ function get_features($filtered = true) {
 			//array('expire',         t('Content Expiration'),		t('Remove old posts/comments after a period of time')),
 			array('multi_profiles', t('Multiple Profiles'),			t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')),
 			array('photo_location', t('Photo Location'),			t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, get_config('feature_lock','photo_location')),
+			array('export_calendar', t('Export Public Calendar'),		t('Ability for visitors to download the public calendar'), false, get_config('feature_lock','export_calendar')),
 		),
 
 		// Post composition
@@ -71,7 +79,7 @@ function get_features($filtered = true) {
 			t('Post Composition Features'),
 			array('richtext',	t('Richtext Editor'),			t('Enable richtext editor'), false, get_config('feature_lock','richtext')),
 			array('preview',	t('Post Preview'),			t('Allow previewing posts and comments before publishing them'), false, get_config('feature_lock','preview')),
-			array('aclautomention',	t('Auto-mention Forums'),		t('Add/remove mention when a fourm page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
+			array('aclautomention',	t('Auto-mention Forums'),		t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
 		),
 
 		// Network sidebar widgets
@@ -134,6 +142,11 @@ function get_features($filtered = true) {
 		}
 	}
 
+	// Remove the richtext editor setting if the theme doesn't support it
+	if (!get_app()->theme_richtext_editor) {
+		unset($arr['composition'][1]);
+	}
+
 	call_hooks('get_features',$arr);
 	return $arr;
 }