mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3891 from owncloud/fix_loadAppScriptFile 

Check if the app is enabled and the app path is found before trying to l...
This commit is contained in:
Bart Visscher 2013-08-28 06:10:06 -07:00
parent b9a95af12c 57370353ad
commit 45076edf4f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/base.php
View File

@ -669,12 +669,15 @@ class OC {
$app = $param['app'];
$file = $param['file'];
$app_path = OC_App::getAppPath($app);
$file = $app_path . '/' . $file;
unset($app, $app_path);
if (file_exists($file)) {
require_once $file;
return true;
if (OC_App::isEnabled($app) && $app_path !== false) {
$file = $app_path . '/' . $file;
unset($app, $app_path);
if (file_exists($file)) {
require_once $file;
return true;
}
}
header('HTTP/1.0 404 Not Found');
return false;
}