Disable richtext editor for frio - followup for #2938

[friendica.git] / include / features.php

diff --git a/include/features.php b/include/features.php
index 4856f0f19e8678529434b7222cf86c01d0ecbf55..64ab932d00cef7bc8cd0491ae1cd6dadde11dca5 100644 (file)
--- 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']);
@@ -135,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;
 }