diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-04-16 10:13:52 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-04-16 10:13:52 +0200 |
| commit | e42dbbf7f3c98f55d00339e9ce2589890a6e55ba (patch) | |
| tree | 04103b4ead37a3837f6df9e632d4949588704f57 /lib/app.php | |
| parent | 232654cb606af856d24c4b01353f18ac4a48e9bc (diff) | |
| parent | 16e4a1dd1795714426a529f02391d41c41acae71 (diff) | |
| download | nextcloud-server-e42dbbf7f3c98f55d00339e9ce2589890a6e55ba.tar.gz nextcloud-server-e42dbbf7f3c98f55d00339e9ce2589890a6e55ba.zip | |
merge
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/app.php b/lib/app.php index ddbad4ee2ec..f9101ba4052 100644 --- a/lib/app.php +++ b/lib/app.php @@ -49,12 +49,17 @@ class OC_APP{ return true; } - // Get all appinfo - $dir = opendir( $SERVERROOT ); + // Our very own core apps are hardcoded + foreach( array( "admin", "files", "log", "settings" ) as $app ){ + oc_require( "$app/appinfo/app.php" ); + } + + // The rest comes here + $dir = opendir( "$SERVERROOT/apps" ); while( false !== ( $filename = readdir( $dir ))){ if( substr( $filename, 0, 1 ) != '.' ){ - if( file_exists( "$SERVERROOT/$filename/appinfo/app.php" )){ - require( "$filename/appinfo/app.php" ); + if( file_exists( "$SERVERROOT/apps/$filename/appinfo/app.php" )){ + require( "apps/$filename/appinfo/app.php" ); } } } @@ -281,7 +286,7 @@ class OC_APP{ } /** - * @brief Installs an application + * @brief Update an application * @param $data array with all information * @returns integer * |