[fix] Remove isAllowedScript leftovers (#6366)

Fixes #6365
This commit is contained in:
Martín Fernández
2020-07-09 18:11:56 +02:00
committed by GitHub
parent d6b820fd5a
commit f9293a67b0
3 changed files with 3 additions and 3 deletions

View File

@@ -94,7 +94,7 @@ function FileManagerCollection:onMenuHold(item)
},
}
-- NOTE: Duplicated from frontend/apps/filemanager/filemanager.lua
if not Device:isAndroid() and util.isAllowedScript(item.file) then
if Device:canExecuteScript(item.file) then
table.insert(buttons, {
{
-- @translators This is the script's programming language (e.g., shell or python)

View File

@@ -1035,7 +1035,7 @@ function CreDocument:register(registry)
registry:addProvider("rtf", "application/rtf", self, 90)
registry:addProvider("xhtml", "application/xhtml+xml", self, 90)
registry:addProvider("zip", "application/zip", self, 10)
-- Scripts that we allow running in the FM (c.f., util.isAllowedScript)
-- Scripts that we allow running in the FM (c.f., Device:canExecuteScript)
registry:addProvider("sh", "application/x-shellscript", self, 90)
registry:addProvider("py", "text/x-python", self, 90)
end

View File

@@ -722,7 +722,7 @@ end
--- Companion helper function that returns the script's language,
--- based on the filme extension.
---- @string filename
---- @treturn string (lowercase) (or nil if !isAllowedScript)
---- @treturn string (lowercase) (or nil if not Device:canExecuteScript(file))
function util.getScriptType(file)
local file_ext = string.lower(util.getFileNameSuffix(file))
if file_ext == "sh" then