Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Dubiniuk <victor.dubiniuk@gmail.com>2012-10-19 00:10:33 +0400
committerVictor Dubiniuk <victor.dubiniuk@gmail.com>2012-10-19 00:10:33 +0400
commit6244d68b6a50facac1d1cfbe51fedf7acfbb2daf (patch)
tree6c61be17aae48d770615d72d66c2279a037d6ebc
parentecbf9ff90a3adc65730c142da9f36613e9869a14 (diff)
Fix 'App already installed' for app with entry in DB and no files
-rw-r--r--lib/installer.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/installer.php b/lib/installer.php
index c5ca0883d76..dacdbdb864b 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -145,12 +145,14 @@ class OC_Installer{
//check if an app with the same id is already installed
if(self::isInstalled( $info['id'] )){
- OC_Log::write('core','App already installed',OC_Log::WARN);
- OC_Helper::rmdirr($extractDir);
- if($data['source']=='http'){
- unlink($path);
+ if (OC_App::getAppInfo($app, true)!==null){
+ OC_Log::write('core','App already installed',OC_Log::WARN);
+ OC_Helper::rmdirr($extractDir);
+ if($data['source']=='http'){
+ unlink($path);
+ }
+ return false;
}
- return false;
}
//check if the destination directory already exists