aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/contact_widgets.php5
-rw-r--r--include/conversation.php3
2 files changed, 7 insertions, 1 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 1230e2b24..13c7c52c8 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -104,8 +104,11 @@ function fileas_widget($baseurl,$selected = '') {
}
function categories_widget($baseurl,$selected = '') {
- $a = get_app();
+ if(! featured_enabled($a->profile['profile_uid'],'categories'))
+ return '';
+
+ $a = get_app();
$terms = array();
$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
diff --git a/include/conversation.php b/include/conversation.php
index 9a76c9df1..87cc1b737 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1684,6 +1684,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$jotplugins = '';
$jotnets = '';
+ $catsenabled = feature_enabled($x['profile_uid'],'categories');
+
call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets);
@@ -1712,6 +1714,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$shortnoloc' => t('clear location'),
'$title' => "",
'$placeholdertitle' => t('Set title'),
+ '$catsenabled' => $catsenabled,
'$category' => "",
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$wait' => t('Please wait'),