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

Merge pull request #14961 from owncloud/onlyrequireinfo 

Only hard depend on the info.xml and not the app.php
This commit is contained in:
Bernhard Posselt 2015-03-17 21:27:51 +01:00
parent 760f5fc5e5 57ceed590a
commit 087117d87d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/app.php
View File

@ -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
*/