wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory

Browse source 
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
This commit is contained in:
Thomas Müller 2015-10-16 21:28:55 +02:00
commit 6cd1126dd1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/tests/unit/connector/sabre/file.php
View file

@ -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();
}

2
lib/private/installer.php
View file

@ -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']);