X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeatures.php;h=07dcced0e6da630b1142f9112f080a68b8843d19;hb=1f9b52f2bf62a00add5b62b21e2dd009246345ef;hp=64ab932d00cef7bc8cd0491ae1cd6dadde11dca5;hpb=d489ba1510a2dcfaa7851d937d3c37a9541544c9;p=friendica.git

diff --git a/include/features.php b/include/features.php
index 64ab932d00..07dcced0e6 100644
--- a/include/features.php
+++ b/include/features.php
@@ -11,11 +11,6 @@
  * @return boolean
  */
 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) {
@@ -35,15 +30,15 @@ function feature_enabled($uid, $feature) {
 
 /**
  * @brief check if feature is enabled or disabled by default
- * 
+ *
  * @param string $feature
  * @return boolean
  */
 function get_feature_default($feature) {
 	$f = get_features();
-	foreach($f as $cat) {
-		foreach($cat as $feat) {
-			if(is_array($feat) && $feat[0] === $feature)
+	foreach ($f as $cat) {
+		foreach ($cat as $feat) {
+			if (is_array($feat) && $feat[0] === $feature)
 				return $feat[3];
 		}
 	}
@@ -52,13 +47,13 @@ function get_feature_default($feature) {
 
 /**
  * @brief Get a list of all available features
- * 
+ *
  * The array includes the setting group, the setting name,
  * explainations for the setting and if it's enabled or disabled
  * by default
- * 
+ *
  * @param bool $filtered True removes any locked features
- * 
+ *
  * @return array
  */
 function get_features($filtered = true) {
@@ -77,7 +72,6 @@ function get_features($filtered = true) {
 		// Post composition
 		'composition' => array(
 			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 forum page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
 		),
@@ -122,13 +116,13 @@ function get_features($filtered = true) {
 
 	// removed any locked features and remove the entire category if this makes it empty
 
-	if($filtered) {
-		foreach($arr as $k => $x) {
+	if ($filtered) {
+		foreach ($arr as $k => $x) {
 			$has_items = false;
 			$kquantity = count($arr[$k]);
-			for($y = 0; $y < $kquantity; $y ++) {
-				if(is_array($arr[$k][$y])) {
-					if($arr[$k][$y][4] === false) {
+			for ($y = 0; $y < $kquantity; $y ++) {
+				if (is_array($arr[$k][$y])) {
+					if ($arr[$k][$y][4] === false) {
 						$has_items = true;
 					}
 					else {
@@ -136,17 +130,12 @@ function get_features($filtered = true) {
 					}
 				}
 			}
-			if(! $has_items) {
+			if (! $has_items) {
 				unset($arr[$k]);
 			}
 		}
 	}
 
-	// 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;
 }