From: rabuzarus <rabuzarus@t-online.de>
Date: Sat, 25 Nov 2017 22:41:20 +0000 (+0100)
Subject: Merge develop into 20171122_-_port_tagcloud
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4224209497a6c7f723ea2b4d989f99890bccc47f;p=friendica.git

Merge develop into 20171122_-_port_tagcloud

Conflicts:
	include/features.php
---

4224209497a6c7f723ea2b4d989f99890bccc47f
diff --cc include/features.php
index 340394ecea,ade93a18e3..f199357315
--- a/include/features.php
+++ b/include/features.php
@@@ -113,8 -113,7 +113,8 @@@ function get_features($filtered = true
  		// Advanced Profile Settings
  		'advanced_profile' => array(
  			t('Advanced Profile Settings'),
- 			array('forumlist_profile', t('List Forums'),			t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile')),
+ 			array('forumlist_profile', t('List Forums'),			t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile', false)),
 +			array('tagadelic',	t('Tag Cloud'),				t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic')),
  		),
  	);