Fix: alternative websocket template was not used in dashboard; Move templates_alt from application to config #1017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…emplates_alt from application to config
sergejey
reviewed
Nov 15, 2021
| @@ -94,7 +94,10 @@ | |||
|
|
|||
| <?php | |||
| $out['REQUEST_URI']=$_SERVER['REQUEST_URI']; | |||
| $template_file=DIR_TEMPLATES.'websockets.html'; | |||
| $template_file = DIR_TEMPLATES . 'websockets.html'; | |||
| if (defined('ALTERNATIVE_TEMPLATES') && file_exists(ALTERNATIVE_TEMPLATES . 'websockets.html')) { | |||
There was a problem hiding this comment.
А это действительно нужно? На сколько я помню, parser сам по себе поддерживает альтернативные шаблоны и принудительно для каждого файла нет необходимости его указывать, достаточно лишь чтобы была задана константа пути к альтернативным шаблонам.
There was a problem hiding this comment.
Альтернативный шаблон websockets.html не работал именно во фриборде
sergejey
reviewed
Nov 15, 2021
| @@ -13,6 +13,7 @@ Define('DB_USER', 'root'); | |||
| Define('DB_PASSWORD', ''); | |||
|
|
|||
| Define('DIR_TEMPLATES', "./templates/"); | |||
| Define('ALTERNATIVE_TEMPLATES', "/templates_alt/"); | |||
There was a problem hiding this comment.
тут наверное не совсем корректный формат имени папки -- наверное должно быть "./templates_alt/" ?
There was a problem hiding this comment.
Да, тут я ошибся. Спасибо что заметили)
There was a problem hiding this comment.
Вы можете отредактировать, когда смержите пул реквест? или нужно создавать новый?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.