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

fix photo item for search_item.tpl and a minor css fix

Browse Source
This commit is contained in:
Mario Vavti
2015-10-30 18:46:16 +01:00
parent d0b0d0ec72
commit f8b767ed32
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/conversation.php
View File

@@ -681,7 +681,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$body = prepare_body($item,true); $body = prepare_body($item,true);
$is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($profile_owner,'large_photos'))) ? true : false);
$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
$tmp_item = array( $tmp_item = array(
@@ -698,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
'thumb' => $profile_avatar, 'thumb' => $profile_avatar,
'title' => $item['title'], 'title' => $item['title'],
'body' => $body['html'], 'body' => $body['html'],
'photo' => $body['photo'],
'tags' => $body['tags'], 'tags' => $body['tags'],
'categories' => $body['categories'], 'categories' => $body['categories'],
'mentions' => $body['mentions'], 'mentions' => $body['mentions'],
@@ -738,7 +738,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'thread_level' => 1, 'thread_level' => 1,
'is_photo' => $is_photo,
'has_tags' => $has_tags, 'has_tags' => $has_tags,
); );

2
include/photo/photo_gd.php
View File

@@ -137,4 +137,4 @@ class photo_gd extends photo_driver {
return $string; return $string;
} }
} }

1
view/theme/redbasic/css/style.css
View File

@@ -757,6 +757,7 @@ a.rateme, div.rateme {
.wall-item-conv { .wall-item-conv {
padding: 7px 10px; padding: 7px 10px;
background-color: $comment_item_colour;
} }