Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong protocol in the File Manager Dialog #11526

Merged
merged 2 commits into from Nov 29, 2018
Merged

Fix wrong protocol in the File Manager Dialog #11526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aebdb7f
Fix wrong protocol in the File Manager Dialog
freakstatic Nov 27, 2018
2e0c6f4
Improve the way of getting the protocol
freakstatic Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin-dev/filemanager/dialog.php
View file
Open in desktop
Expand Up @@ -347,9 +347,9 @@
?>"/>
<input type="hidden" id="descending" value="<?php echo $descending ? "true" : "false";
?>"/>
<?php $protocol = 'http';
<?php $protocol = Tools::getShopProtocol();
?>
<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter), array(''), $protocol."://".$_SERVER['HTTP_HOST'].Tools::safeOutput($_SERVER['REQUEST_URI']));
<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter), array(''), $protocol.$_SERVER['HTTP_HOST'].Tools::safeOutput($_SERVER['REQUEST_URI']));
?>"/>
<input type="hidden" id="lang_show_url" value="<?php echo Tools::safeOutput(lang_Show_url);
?>"/>
Expand Down