mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct installer

This commit is contained in:
Brice Maron 2012-06-01 22:11:03 +00:00
parent b6c5ca126b
commit 6832aec60f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/installer.php
View File

@ -126,7 +126,7 @@ class OC_Installer{
return false; return false;
} }
$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true); $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 // check the code for not allowed calls
if(!OC_Installer::checkCode($info['id'],$extractDir)){ if(!OC_Installer::checkCode($info['id'],$extractDir)){
@ -312,13 +312,13 @@ class OC_Installer{
*/ */
public static function installShippedApp($app){ public static function installShippedApp($app){
//install the database //install the database
if(is_file(OC::$APPSROOT."/apps/$app/appinfo/database.xml")){ if(is_file(OC_App::getAppPath($app)."/appinfo/database.xml")){
OC_DB::createDbFromStructure(OC::$APPSROOT."/apps/$app/appinfo/database.xml"); OC_DB::createDbFromStructure(OC_App::getAppPath($app)."/appinfo/database.xml");
} }
//run appinfo/install.php //run appinfo/install.php
if(is_file(OC::$APPSROOT."/apps/$app/appinfo/install.php")){ if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")){
include(OC::$APPSROOT."/apps/$app/appinfo/install.php"); include(OC_App::getAppPath($app)."/appinfo/install.php");
} }
$info=OC_App::getAppInfo($app); $info=OC_App::getAppInfo($app);
OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app)); OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));