Skip to content

Commit c33e9fc

Browse files
authored
Merge branch 'develop' into feature/zhimprove
2 parents d281cfd + 3d9bb53 commit c33e9fc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
1111
* Fixes an issue with the locations API endpoint referencing an invalid namespace.
1212
* Fixes the `store()` function on the locations API not working due to an incorrect return typehint.
1313
* Fixes daemon secrets not being able to be reset on a Node.
14-
14+
* Fixes an issue where files were not editable due to missing URL encoding in the file manager.
15+
* Fixed checking of language changes
16+
* Fixed Spigot egg not building versions other than `latest`.
17+
* Fixed the Forge egg install script.
18+
1519
### Updated
1620
* Upgraded core to use Laravel `5.7.14`.
1721

resources/themes/pterodactyl/server/files/list.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<td data-identifier="name" data-name="{{ rawurlencode($file['entry']) }}" data-path="@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}@endif/">
142142
@if(in_array($file['mime'], $editableMime))
143143
@can('edit-files', $server)
144-
<a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}" class="edit_file">{{ $file['entry'] }}</a>
144+
<a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}" class="edit_file">{{ $file['entry'] }}</a>
145145
@else
146146
{{ $file['entry'] }}
147147
@endcan

0 commit comments

Comments
 (0)