IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1062 from ComputerDruid/fix-which-s

Browse Source 
Use "command -v" to test for convert instead of "which -s"
This commit is contained in:
Robin Ward
2013-06-21 07:12:42 -07:00
parent 8dceb655db 8009b3f036
commit 455742d3ee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/admin_dashboard_data.rb
View File

@@ -107,7 +107,7 @@ class AdminDashboardData
end end
def image_magick_check def image_magick_check
I18n.t('dashboard.image_magick_warning') if SiteSetting.create_thumbnails and !system("which -s convert") I18n.t('dashboard.image_magick_warning') if SiteSetting.create_thumbnails and !system("command -v convert >/dev/null;")
end end
def failing_emails_check def failing_emails_check