diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-02 02:11:03 +0400 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-07 00:23:17 +0400 |
| commit | 6832aec60fcdcc7e8b6433d8f9103cdf347f32ed (patch) | |
| tree | 81269df55d021646228ceb9db163f2ad9569b7c6 /lib/installer.php | |
| parent | b6c5ca126b802354c44a374e72b2e0b677b2af90 (diff) | |
Correct installer
Diffstat (limited to 'lib/installer.php')
| -rw-r--r-- | lib/installer.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/installer.php b/lib/installer.php index 5c030d2917d..afe0b9e1bba 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -126,7 +126,7 @@ class OC_Installer{ return false; } $info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true); - $basedir=OC::$APPSROOT.'/apps/'.$info['id']; + $basedir=OC_App::getAppPath($info['id']); // check the code for not allowed calls if(!OC_Installer::checkCode($info['id'],$extractDir)){ @@ -312,13 +312,13 @@ class OC_Installer{ */ public static function installShippedApp($app){ //install the database - if(is_file(OC::$APPSROOT."/apps/$app/appinfo/database.xml")){ - OC_DB::createDbFromStructure(OC::$APPSROOT."/apps/$app/appinfo/database.xml"); + if(is_file(OC_App::getAppPath($app)."/appinfo/database.xml")){ + OC_DB::createDbFromStructure(OC_App::getAppPath($app)."/appinfo/database.xml"); } //run appinfo/install.php - if(is_file(OC::$APPSROOT."/apps/$app/appinfo/install.php")){ - include(OC::$APPSROOT."/apps/$app/appinfo/install.php"); + if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")){ + include(OC_App::getAppPath($app)."/appinfo/install.php"); } $info=OC_App::getAppInfo($app); OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app)); |