aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-08-23 17:46:20 -0700
committerzotlabs <mike@macgirvin.com>2017-08-23 17:46:20 -0700
commit3b68df1be6173cbcc50386efc0161ece2015112d (patch)
treee075614cc9faa7a3cf1f93cff8c91cf0da34e663 /include
parent9518dc0e4ee40c9672e533afbb1a506c3a85c598 (diff)
downloadvolse-hubzilla-3b68df1be6173cbcc50386efc0161ece2015112d.tar.gz
volse-hubzilla-3b68df1be6173cbcc50386efc0161ece2015112d.tar.bz2
volse-hubzilla-3b68df1be6173cbcc50386efc0161ece2015112d.zip
several card enhancements
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php7
-rwxr-xr-xinclude/items.php2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index c9142ac30..e0de6fdce 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1305,6 +1305,11 @@ function status_editor($a, $x, $popup = false) {
if(! $cipher)
$cipher = 'aes256';
+ if(array_key_exists('catsenabled',$x))
+ $catsenabled = $x['catsenabled'];
+ else
+ $catsenabled = ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : '');
+
// avoid illegal offset errors
if(! array_key_exists('permissions',$x))
$x['permissions'] = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
@@ -1349,7 +1354,7 @@ function status_editor($a, $x, $popup = false) {
'$clearloc' => $clearloc,
'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')),
- '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''),
+ '$catsenabled' => $catsenabled,
'$category' => ((x($x, 'category')) ? $x['category'] : ''),
'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$permset' => t('Permission settings'),
diff --git a/include/items.php b/include/items.php
index e7bec7f20..070c4571a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4111,6 +4111,8 @@ function webpage_to_namespace($webpage) {
$page_type = 'BUILDBLOCK';
elseif($webpage == ITEM_TYPE_PDL)
$page_type = 'PDL';
+ elseif($webpage == ITEM_TYPE_CARD)
+ $page_type = 'CARD';
elseif($webpage == ITEM_TYPE_DOC)
$page_type = 'docfile';
else