MySQL ANY_VALUE with fallback to MIN

[friendica.git] / include / features.php

diff --git a/include/features.php b/include/features.php
index 4856f0f19e8678529434b7222cf86c01d0ecbf55..74c110427ce6c8d87d02c1039bc59407d1960aa9 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -7,20 +7,22 @@
 
 /**
  * @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) {
+       $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']);
@@ -28,7 +30,7 @@ function feature_enabled($uid,$feature) {
 
 /**
  * @brief check if feature is enabled or disabled by default
- * 
+ *
  * @param string $feature
  * @return boolean
  */
@@ -45,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) {
@@ -70,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')),
                ),