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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-10-01 22:24:44 -07:00
commit f7aaa2290a
3 changed files with 7764 additions and 8780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/bbcode.php
View File

@ -131,7 +131,7 @@ function bb_ShareAttributes($match) {
// FIXME - this should really be a wall-item-ago so it will get updated on the client // FIXME - this should really be a wall-item-ago so it will get updated on the client
$reldate = (($posted) ? relative_date($posted) : ''); $reldate = (($posted) ? relative_date($posted) : '');
$headline = '<div class="shared_header">'; $headline = '<div class="shared_container"> <div class="shared_header">';
if ($avatar != "") if ($avatar != "")
$headline .= '<img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" />'; $headline .= '<img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" />';
@ -146,7 +146,7 @@ function bb_ShareAttributes($match) {
$headline .= '<span>' . $fmt . '</span></div>'; $headline .= '<span>' . $fmt . '</span></div>';
$text = $headline . '<div class="reshared-content">' . trim($match[2]) . '</div>'; $text = $headline . '<div class="reshared-content">' . trim($match[2]) . '</div></div>';
return($text); return($text);
} }

13378
view/de/messages.po
View File

File diff suppressed because it is too large Load Diff

3162
view/de/strings.php
View File

File diff suppressed because it is too large Load Diff