only install shipped apps on setup that should be enabled by default
This commit is contained in:
parent
f0f1adb994
commit
09a5c59cca
|
@ -263,11 +263,8 @@ class OC_Installer{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Installs shipped apps
|
* @brief Installs shipped apps
|
||||||
* @param $enabled
|
|
||||||
*
|
*
|
||||||
* This function installs all apps found in the 'apps' directory;
|
* This function installs all apps found in the 'apps' directory that should be enabled by default;
|
||||||
* If $enabled is true, apps are installed as enabled.
|
|
||||||
* If $enabled is false, apps are installed as disabled.
|
|
||||||
*/
|
*/
|
||||||
public static function installShippedApps(){
|
public static function installShippedApps(){
|
||||||
$dir = opendir( OC::$APPSROOT."/apps" );
|
$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( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$APPSROOT."/apps/$filename") ){
|
||||||
if( file_exists( OC::$APPSROOT."/apps/$filename/appinfo/app.php" )){
|
if( file_exists( OC::$APPSROOT."/apps/$filename/appinfo/app.php" )){
|
||||||
if(!OC_Installer::isInstalled($filename)){
|
if(!OC_Installer::isInstalled($filename)){
|
||||||
$info = OC_Installer::installShippedApp($filename);
|
$info=OC_App::getAppInfo($filename);
|
||||||
$enabled = isset($info['default_enable']);
|
$enabled = isset($info['default_enable']);
|
||||||
if( $enabled ){
|
if( $enabled ){
|
||||||
|
OC_Installer::installShippedApp($filename);
|
||||||
OC_Appconfig::setValue($filename,'enabled','yes');
|
OC_Appconfig::setValue($filename,'enabled','yes');
|
||||||
}else{
|
|
||||||
OC_Appconfig::setValue($filename,'enabled','no');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue