jsharmony-cms 1.9.6 → 1.9.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/models/_funcs.deploy.js +2 -2
- package/models/_funcs.page.js +2 -0
- package/package.json +1 -1
package/models/_funcs.deploy.js
CHANGED
|
@@ -2618,11 +2618,11 @@ module.exports = exports = function(module, funcs){
|
|
|
2618
2618
|
var fstream = fs.createReadStream(page_fpath);
|
|
2619
2619
|
funcs.deploy_log_info(deployment_id, 'Uploading: '+page_path);
|
|
2620
2620
|
funcs.deploy_log_change(deployment_id, 'Copying file: '+page_path);
|
|
2621
|
-
var uploadParams = {
|
|
2621
|
+
var uploadParams = _.extend({}, deployment.publish_params.s3_config.upload_params || {}, {
|
|
2622
2622
|
Bucket: bucket,
|
|
2623
2623
|
Key: page_bpath,
|
|
2624
2624
|
Body: fstream,
|
|
2625
|
-
};
|
|
2625
|
+
});
|
|
2626
2626
|
var contentType = HelperFS.getMimeType(page_bpath);
|
|
2627
2627
|
if(contentType) uploadParams.ContentType = contentType;
|
|
2628
2628
|
s3.upload(uploadParams, function(err, data){
|
package/models/_funcs.page.js
CHANGED
|
@@ -303,6 +303,8 @@ module.exports = exports = function(module, funcs){
|
|
|
303
303
|
return content.substr(startOfLine, endOfLine - startOfLine + 1);
|
|
304
304
|
});
|
|
305
305
|
|
|
306
|
+
newURL = Helper.replaceAll(newURL, ' ', '%20');
|
|
307
|
+
|
|
306
308
|
//Re-encode HTML entities
|
|
307
309
|
if(escapeHtmlEntities){
|
|
308
310
|
newURL = Helper.escapeHTML(newURL);
|