diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-07 00:02:40 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-07 00:02:40 +0100 |
| commit | bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (patch) | |
| tree | 19198a800f4eb67f7abdd2db273e4d52469faf4f /include/features.php | |
| parent | 1f82beb2ef4b04d8da8dca4485c9dd64aa86d86b (diff) | |
| parent | 761afd029d97703f2f7609d546b7b5f3d257c601 (diff) | |
| download | volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.gz volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.bz2 volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/features.php')
| -rw-r--r-- | include/features.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/include/features.php b/include/features.php index b02d912cf..3cbbf5b7d 100644 --- a/include/features.php +++ b/include/features.php @@ -36,7 +36,7 @@ function get_feature_default($feature) { } -function get_features() { +function get_features($filtered = true) { $arr = array( @@ -98,20 +98,22 @@ function get_features() { // removed any locked features and remove the entire category if this makes it empty - foreach($arr as $k => $x) { - $has_items = false; - for($y = 0; $y < count($arr[$k]); $y ++) { - if(is_array($arr[$k][$y])) { - if($arr[$k][$y][4] === false) { - $has_items = true; - } - else { - unset($arr[$k][$y]); + if($filtered) { + foreach($arr as $k => $x) { + $has_items = false; + for($y = 0; $y < count($arr[$k]); $y ++) { + if(is_array($arr[$k][$y])) { + if($arr[$k][$y][4] === false) { + $has_items = true; + } + else { + unset($arr[$k][$y]); + } } } - } - if(! $has_items) { - unset($arr[$k]); + if(! $has_items) { + unset($arr[$k]); + } } } |