harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove double tags on search results, updates to install doco to get rid of Friendica name there and clarify Red requirements.

Browse Source
This commit is contained in:
friendica
2013-07-09 22:48:34 -07:00
parent 69d9ec9a94
commit 5a8cda632b
6 changed files with 54 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/conversation.php
View File

@@ -584,17 +584,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$tags=array();
$hashtags = array();
$mentions = array();
foreach(explode(',',$item['tag']) as $tag){
$tag = trim($tag);
if ($tag!="") {
$t = bbcode($tag);
$tags[] = $t;
if($t[0] == '#')
$hashtags[] = $t;
elseif($t[0] == '@')
$mentions[] = $t;
}
}
$sp = false;
$profile_link = best_link_url($item,$sp);
@@ -650,7 +639,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$tmp_item = array(
'template' => $tpl,
'toplevel' => 'toplevel_item',
'tags' => $tags,
'id' => (($preview) ? 'P0' : $item['item_id']),
'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url),
'profile_url' => $profile_link,

31
include/text.php
View File

@@ -1023,19 +1023,24 @@ function prepare_body($item,$attach = false) {
$s .= '<div class="clear"></div></div>';
}
if(is_array($item['term']) && count($item['term'])) {
$tstr = '';
foreach($item['term'] as $t) {
$t1 = format_term_for_display($t);
if($t1) {
if($tstr)
$tstr .= ' ';
$tstr .= $t1;
}
}
if($tstr)
$s .= '<br /><div class="posttags">' . $tstr . '</div>';
}
// At some point in time, posttags were removed from the threaded conversation templates, but remained in the search_item template.
// Code to put them back was added into include/conversation.php and/or include/ItemObject.php but under new class names
// Then it was discovered that the following bits remained of the old code.
// Commented out, but we may decide to use this instead of the other version and put all the tag rendering in one place. In the other
// location it is more theme-able.
// if(is_array($item['term']) && count($item['term'])) {
// $tstr = '';
// foreach($item['term'] as $t) {
// $t1 = format_term_for_display($t);
// if($t1) {
// if($tstr)
// $tstr .= ' ';
// $tstr .= $t1;
// }
// }
// if($tstr)
// $s .= '<br /><div class="posttags">' . $tstr . '</div>';
// }
$writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false);