github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't use backticks that take in inputs.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-03-17 14:21:30 +08:00
parent b49bf889f6
commit e7c972ac89
11 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/uploads_controller.rb
View File

@ -81,7 +81,8 @@ class UploadsController < ApplicationController
if filename == "image.png" && SiteSetting.convert_pasted_images_to_hq_jpg
jpeg_path = "#{File.dirname(tempfile.path)}/image.jpg"
OptimizedImage.ensure_safe_paths!(tempfile.path, jpeg_path)
`convert #{tempfile.path} -quality #{SiteSetting.convert_pasted_images_quality} #{jpeg_path}`
Discourse::Utils.execute_command('convert', tempfile.path, '-quality', SiteSetting.convert_pasted_images_quality.to_s, jpeg_path)
# only change the format of the image when JPG is at least 5% smaller
if File.size(jpeg_path) < File.size(tempfile.path) * 0.95
filename = "image.jpg"