From 09a5c59cca415a046766ae7262926460721902ad Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 29 Apr 2012 14:38:56 +0200
Subject: [PATCH] only install shipped apps on setup that should be enabled by
default
---
lib/installer.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/installer.php b/lib/installer.php
index d559227381..b75c009c8f 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');
}
}
}
--
GitLab