clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into bugfix-attachments

This commit is contained in:
Michael Vogel 2016-04-18 06:15:29 +02:00
parent 26f62a97fd a5f97b2d87
commit d928928fda
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/message.php
View File

@ -2,6 +2,7 @@
require_once('include/acl_selectors.php');
require_once('include/message.php');
require_once('include/Smilies.php');
function message_init(&$a) {
@ -460,13 +461,13 @@ function message_content(&$a) {
if($a->theme['template_engine'] === 'internal') {
$from_name_e = template_escape($message['from-name']);
$subject_e = template_escape($message['title']);
$body_e = template_escape(smilies(bbcode($message['body'])));
$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
$to_name_e = template_escape($message['name']);
}
else {
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$body_e = smilies(bbcode($message['body']));
$body_e = Smilies::replace(bbcode($message['body']));
$to_name_e = $message['name'];
}

4
view/theme/vier/mobile.css
View File

@ -1,4 +1,4 @@
aside, header, #nav-events-link, #search-box, #nav-admin-link, #activitiy-by-date-tab, #shared-links-tab,
aside, header, #nav-events-link, #nav-search-box, #nav-admin-link, #activitiy-by-date-tab, #shared-links-tab,
.wall-item-location {
display: none;
}
@ -277,4 +277,4 @@ select:focus {
}
.type-link > a { height: 120px; width: 100%; overflow: hidden; display: block; }
.type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: auto !important; }
.type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: auto !important; }