diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/installer.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/installer.php b/lib/installer.php index d5592273815..b75c009c8f0 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -263,11 +263,8 @@ class OC_Installer{ /** * @brief Installs shipped apps - * @param $enabled * - * This function installs all apps found in the 'apps' directory; - * If $enabled is true, apps are installed as enabled. - * If $enabled is false, apps are installed as disabled. + * This function installs all apps found in the 'apps' directory that should be enabled by default; */ public static function installShippedApps(){ $dir = opendir( OC::$APPSROOT."/apps" ); @@ -275,12 +272,11 @@ class OC_Installer{ if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$APPSROOT."/apps/$filename") ){ if( file_exists( OC::$APPSROOT."/apps/$filename/appinfo/app.php" )){ if(!OC_Installer::isInstalled($filename)){ - $info = OC_Installer::installShippedApp($filename); + $info=OC_App::getAppInfo($filename); $enabled = isset($info['default_enable']); if( $enabled ){ + OC_Installer::installShippedApp($filename); OC_Appconfig::setValue($filename,'enabled','yes'); - }else{ - OC_Appconfig::setValue($filename,'enabled','no'); } } } |