provide an option to toggle the view of locked features so we can use the same list in an admin feature set & lock page.

2 files changed, 16 insertions, 14 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]);
+			}
 		}
 	}
 
diff --git a/version.inc b/version.inc
index 8a363fc45..fe3e27349 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-04.1268H
+2016-01-05.1269H