diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-16 21:28:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-16 21:28:55 +0200 |
| commit | 6cd1126dd13ec4561144a0124bedd5394a7c8ff9 (patch) | |
| tree | e275bc713cd34ef05097e54851b71769a0f90ff0 | |
| parent | 0f309c0977f190419b6f1bb04b4afbb189d82eea (diff) | |
| parent | 8a036842aa74620d9cf5f19b2c4054089d44a936 (diff) | |
| download | nextcloud-server-6cd1126dd13ec4561144a0124bedd5394a7c8ff9.tar.gz nextcloud-server-6cd1126dd13ec4561144a0124bedd5394a7c8ff9.zip | |
Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
| -rw-r--r-- | apps/dav/tests/unit/connector/sabre/file.php | 2 | ||||
| -rw-r--r-- | lib/private/installer.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php index 6685ddac913..9ca8c994a04 100644 --- a/apps/dav/tests/unit/connector/sabre/file.php +++ b/apps/dav/tests/unit/connector/sabre/file.php @@ -822,7 +822,7 @@ class File extends \Test\TestCase { 'permissions' => \OCP\Constants::PERMISSION_ALL ), null); - $file = new \OC\Connector\Sabre\File($view, $info); + $file = new \OCA\DAV\Connector\Sabre\File($view, $info); $file->get(); } diff --git a/lib/private/installer.php b/lib/private/installer.php index 861ce6ea41b..b5ccc02abf3 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -502,7 +502,7 @@ class OC_Installer{ if($dir = opendir( $app_dir['path'] )) { while( false !== ( $filename = readdir( $dir ))) { if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ) { - if( file_exists( $app_dir['path']."/$filename/appinfo/app.php" )) { + if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) { if(!OC_Installer::isInstalled($filename)) { $info=OC_App::getAppInfo($filename); $enabled = isset($info['default_enable']); |