diff options
| author | Mario <mario@mariovavti.com> | 2023-03-18 15:47:09 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-03-18 15:47:09 +0000 |
| commit | c1ddb89990945acd7f50d32971648cec1250ceb0 (patch) | |
| tree | fb2c7b6cb93658dabd087156585314bd1c2e8921 | |
| parent | 7ac7cb129f0a7502131839e4108b7afd886187e9 (diff) | |
| parent | 2f5fa4df75526bcb343ba0d133b593095bcca7c3 (diff) | |
| download | volse-hubzilla-c1ddb89990945acd7f50d32971648cec1250ceb0.tar.gz volse-hubzilla-c1ddb89990945acd7f50d32971648cec1250ceb0.tar.bz2 volse-hubzilla-c1ddb89990945acd7f50d32971648cec1250ceb0.zip | |
Merge branch 'dev' into 8.2RC
| -rw-r--r-- | include/bbcode.php | 6 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 6ec24fa0b..735f267c3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -295,9 +295,11 @@ function bb_parse_b64_crypt($match) { if(empty($match[2])) return; - $r .= '----- ENCRYPTED CONTENT -----' . PHP_EOL; - $r .= $match[2] . PHP_EOL; + $r .= '<code>'; + $r .= '----- ENCRYPTED CONTENT -----' . '<br>'; + $r .= $match[2] . '<br>'; $r .= '----- END ENCRYPTED CONTENT -----'; + $r .= '</code>'; return $r; diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index a851eb203..587adaeea 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -175,7 +175,7 @@ {{if $is_owner}} <a id="cloud-tool-share-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-share-btn" href="/rpost?attachment=[attachment]{{$item.resource}},{{$item.revision}}[/attachment]&acl[allow_cid]={{$item.raw_allow_cid}}&acl[allow_gid]={{$item.raw_allow_gid}}&acl[deny_cid]={{$item.raw_deny_cid}}&acl[deny_gid]={{$item.raw_deny_gid}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-share-square-o"></i> {{$post_label}}</a> {{/if}} - <a id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> + <a download="{{$item.name}}" id="cloud-tool-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-download-btn" href="/attach/{{$item.resource}}" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{/if}} <a id="cloud-tool-delete-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-delete-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-trash-o"></i> {{$delete_label}}</a> </div> |