Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 07:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse source
This commit is contained in:
redmatrix 2015-05-05 19:24:35 -07:00
commit 245080a6d7
6 changed files with 8416 additions and 8515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/bbcode.php
View file

@ -292,7 +292,7 @@ function bb_ShareAttributesSimple($match) {
if ($matches[1] != "")
$profile = $matches[1];
$text = '<br />' . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' <a href="' . $profile . '">' . $author . '</a>: div class="reshared-content">' . $match[2] . '</div>';
$text = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' <a href="' . $profile . '">' . $author . '</a>: div class="reshared-content">' . $match[2] . '</div>';
return($text);
}

6778
view/it/messages.po
View file

File diff suppressed because it is too large Load diff

1682
view/it/strings.php
View file

File diff suppressed because it is too large Load diff

6780
view/nl/messages.po
View file

File diff suppressed because it is too large Load diff

1686
view/nl/strings.php
View file

File diff suppressed because it is too large Load diff

3
view/theme/redbasic/php/style.php
View file

@ -311,8 +311,9 @@ echo str_replace(array_keys($options), array_values($options), $x);
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
}
if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
echo str_replace(array_keys($options), array_values($options), $x);
echo file_get_contents('view/theme/redbasic/css/converse_center.css');
}
if($schemecss) {