merge from maserati (r11600, r11651)

except member_config.html

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11734 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-10-16 07:14:05 +00:00
parent fa882475d1
commit f58c2aad98
4 changed files with 60 additions and 37 deletions

View file

@ -88,6 +88,11 @@ function start(cfg) {
uploaderStatusID : cfg.uploaderStatusID
};
if(typeof(enforce_ssl)!=="undefined" && enforce_ssl)
{
settings.upload_url = request_uri+'index.php';
};
// preview
$('#'+cfg.fileListAreaID).click(previewFiles);