diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | include/features.php | 4 | ||||
| -rw-r--r-- | include/text.php | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 3041d2e21..4a1cdc7da 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1304,6 +1304,8 @@ function status_editor($a, $x, $popup = false) { $id_select = ''; $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); + + $reset = ((x($x,'reset')) ? $x['reset'] : ''); $feature_auto_save_draft = ((feature_enabled($x['profile_uid'], 'auto_save_draft')) ? "true" : "false"); @@ -1329,6 +1331,7 @@ function status_editor($a, $x, $popup = false) { '$nocomment_enabled' => t('Comments enabled'), '$nocomment_disabled' => t('Comments disabled'), '$auto_save_draft' => $feature_auto_save_draft, + '$reset' => $reset )); $tpl = get_markup_template('jot.tpl'); @@ -1441,7 +1444,8 @@ function status_editor($a, $x, $popup = false) { '$expiryModalCANCEL' => t('Cancel'), '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false), - '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0) + '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0), + '$reset' => $reset )); if ($popup === true) { diff --git a/include/features.php b/include/features.php index c865f6754..616e3f6c5 100644 --- a/include/features.php +++ b/include/features.php @@ -237,8 +237,8 @@ function get_features($filtered = true, $level = (-1)) { [ 'permcats', - t('Permission Groups'), - t('Provide alternate connection permission roles.'), + t('Permission Categories'), + t('Create custom connection permission limits'), false, get_config('feature_lock','permcats'), feature_level('permcats',2), diff --git a/include/text.php b/include/text.php index ef3c8871c..aafba2168 100644 --- a/include/text.php +++ b/include/text.php @@ -1415,15 +1415,21 @@ function unobscure_mail(&$item) { function theme_attachments(&$item) { $arr = json_decode($item['attach'],true); + if(is_array($arr) && count($arr)) { $attaches = array(); foreach($arr as $r) { $icon = getIconFromType($r['type']); - $label = (($r['title']) ? urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')) : t('Unknown Attachment')); + + if($r['title']) + $label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')); + + if(! $label && $r['href']) + $label = basename($r['href']); //some feeds provide an attachment where title an empty space - if($label == ' ') + if(! $label || $label == ' ') $label = t('Unknown Attachment'); $title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown')); |