diff options
| author | friendica <info@friendica.com> | 2013-12-11 15:35:54 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-11 15:35:54 -0800 |
| commit | 06c81e189f031a74c54aa14b1f29c93379e7cf3c (patch) | |
| tree | a9ef109569e9bc55262ccfce7ebd326add474a71 /include | |
| parent | d93ba783f54cf862bd91b231b7a9f7a19c657675 (diff) | |
| parent | 1fa4133d430d2cb2753a9fd7e6bf9bfcdc35659b (diff) | |
| download | volse-hubzilla-06c81e189f031a74c54aa14b1f29c93379e7cf3c.tar.gz volse-hubzilla-06c81e189f031a74c54aa14b1f29c93379e7cf3c.tar.bz2 volse-hubzilla-06c81e189f031a74c54aa14b1f29c93379e7cf3c.zip | |
Merge pull request #239 from git-marijus/master
make empty notes saveable as well
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.php | 1 | ||||
| -rw-r--r-- | include/widgets.php | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/features.php b/include/features.php index 05206106a..978d7af8a 100644 --- a/include/features.php +++ b/include/features.php @@ -49,6 +49,7 @@ function get_features() { array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), array('affinity', t('Affinity Tool'), t('Filter stream activity by depth of relationships')), + array('suggest', t('Suggest Channels'), t('Show channel suggestions')), ), // Item tools diff --git a/include/widgets.php b/include/widgets.php index cea5a6ce2..abbe1e2e0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -57,6 +57,9 @@ function widget_collections($args) { function widget_suggestions($arr) { + if((! local_user()) || (! feature_enabled(local_user(),'suggest'))) + return ''; + require_once('include/socgraph.php'); $r = suggestion_query(local_user(),get_observer_hash(),0,20); @@ -143,7 +146,7 @@ function widget_notes($arr) { if(! feature_enabled(local_user(),'private_notes')) return ''; - $text = htmlspecialchars(get_pconfig(local_user(),'notes','text')); + $text = get_pconfig(local_user(),'notes','text'); $o = replace_macros(get_markup_template('notes.tpl'), array( '$banner' => t('Notes'), @@ -330,4 +333,4 @@ function widget_tagcloud_wall($arr) { if(feature_enabled($a->profile['profile_uid'],'tagadelic')) return tagblock('search',$a->profile['profile_uid'],$limit,$a->profile['channel_hash'],ITEM_WALL); return ''; -}
\ No newline at end of file +} |