From a2ec080427048a9539bd89c08846db519e8effaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 16 Oct 2015 17:25:22 +0200 Subject: [PATCH 1/2] an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory --- lib/private/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/installer.php b/lib/private/installer.php index 861ce6ea41..b5ccc02abf 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']); From 8a036842aa74620d9cf5f19b2c4054089d44a936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 16 Oct 2015 17:36:27 +0200 Subject: [PATCH 2/2] Fix failing unit test --- apps/dav/tests/unit/connector/sabre/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php index 6685ddac91..9ca8c994a0 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(); }