diff options
| -rwxr-xr-x | include/text.php | 9 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | view/tpl/item_categories.tpl | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index 125e1182f..ff75535b0 100755 --- a/include/text.php +++ b/include/text.php @@ -1024,6 +1024,9 @@ function theme_attachments(&$item) { $icon = ''; $icontype = substr($r['type'],0,strpos($r['type'],'/')); + // FIXME This should probably be a giant "if" statement in the template so that we don't have icon names + // embedded in php code + switch($icontype) { case 'video': $icon = 'icon-facetime-video'; @@ -1073,8 +1076,10 @@ function format_categories(&$item,$writeable) { $categories = array(); foreach($terms as $t) { $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + if(! trim($term)) + continue; $removelink = (($writeable) ? z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : ''); - $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink); + $categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink, 'url' => $t['url']); } } $s = replace_macros(get_markup_template('item_categories.tpl'),array( @@ -1093,6 +1098,8 @@ function format_filer(&$item) { $categories = array(); foreach($terms as $t) { $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + if(! trim($term)) + continue; $removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']); $categories[] = array('term' => $term, 'removelink' => $removelink); } diff --git a/mod/item.php b/mod/item.php index 3d4845a47..1bdd951cd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -529,7 +529,7 @@ function item_post(&$a) { 'type' => TERM_CATEGORY, 'otype' => TERM_OBJ_POST, 'term' => trim($cat), - 'url' => '' + 'url' => $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) ); } } diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index c482d1ebe..599ad21bd 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} <div class="categorytags"> {{foreach $categories as $cat}} -<span class="item-category"><i class="icon-asterisk cat-icons"></i> {{$cat.term}}{{if $cat.writeable}}<a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a>{{/if}}</span> +<span class="item-category"><i class="icon-asterisk cat-icons"></i> {{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}{{if $cat.writeable}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a>{{/if}}</span> {{/foreach}} </div> {{/if}} |