diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-17 21:27:51 +0100 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-17 21:27:51 +0100 |
| commit | 087117d87d97643dec0eb871597160e6ea4f00d8 (patch) | |
| tree | d210e515bc012067514244eae6a5ed870f93789a | |
| parent | 760f5fc5e550b6444ed156c600fee7673b330857 (diff) | |
| parent | 57ceed590ab8108c9cca5fb4a6f32f9456c7add8 (diff) | |
| download | nextcloud-server-087117d87d97643dec0eb871597160e6ea4f00d8.tar.gz nextcloud-server-087117d87d97643dec0eb871597160e6ea4f00d8.zip | |
Merge pull request #14961 from owncloud/onlyrequireinfo
Only hard depend on the info.xml and not the app.php
| -rw-r--r-- | lib/private/app.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index f51736a59a8..d30ada0391a 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -60,7 +60,7 @@ class OC_App { * @return bool * * This function walks through the ownCloud directory and loads all apps - * it can find. A directory contains an app if the file /appinfo/app.php + * it can find. A directory contains an app if the file /appinfo/info.xml * exists. * * if $types is set, only apps of those types will be loaded @@ -732,7 +732,7 @@ class OC_App { if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { - if ($file[0] != '.' and is_file($apps_dir['path'] . '/' . $file . '/appinfo/app.php')) { + if ($file[0] != '.' and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) { $apps[] = $file; @@ -881,7 +881,7 @@ class OC_App { /** * get a list of all apps on apps.owncloud.com - * + * * @return array|false multi-dimensional array of apps. * Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description */ |