Merge pull request #3891 from owncloud/fix_loadAppScriptFile

Check if the app is enabled and the app path is found before trying to l...
12 years ago · 45076edf4f
parent b9a95af12c 57370353ad
commit 45076edf4f
1 changed files with 8 additions and 5 deletions
--- a/lib/base.php
+++ b/lib/base.php
@ -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;
 	}