mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 19:21:40 +09:00
Merge pull request #1614 from ned3y2k/master
선택적 SSL 환경. 관리자 모듈내 에디터 사용시 파일 첨부가 안되는 문제.
This commit is contained in:
commit
b84b271a90
2 changed files with 5 additions and 1 deletions
|
|
@ -60,6 +60,8 @@
|
|||
last_selected_file: null,
|
||||
});
|
||||
|
||||
var currentEnforce_ssl = window.enforce_ssl;
|
||||
if(location.protocol == 'https:') { window.enforce_ssl = true; }
|
||||
|
||||
var settings = {
|
||||
url: request_uri
|
||||
|
|
@ -122,6 +124,8 @@
|
|||
}
|
||||
}
|
||||
};
|
||||
window.enforce_ssl = currentEnforce_ssl;
|
||||
|
||||
|
||||
data.settings = $.extend({} , default_settings, settings, opt || {});
|
||||
$container.data(data);
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue