From 4410f15dd8259ceb0cfda7cbf6b435d3ecfd239a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 14 Apr 2012 19:01:32 +0200 Subject: don't rely on the old version in info.xml anymore --- lib/installer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/installer.php') diff --git a/lib/installer.php b/lib/installer.php index 38e17130e3c..044bc9a13d1 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -175,7 +175,7 @@ class OC_Installer{ } //set the installed version - OC_Appconfig::setValue($info['id'],'installed_version',$info['version']); + OC_Appconfig::setValue($info['id'],'installed_version',OC_App::getAppVersion($info['id'])); OC_Appconfig::setValue($info['id'],'enabled','no'); return $info['id']; } @@ -297,7 +297,7 @@ class OC_Installer{ include(OC::$APPSROOT."/apps/$app/appinfo/install.php"); } $info=OC_App::getAppInfo($app); - OC_Appconfig::setValue($app,'installed_version',$info['version']); + OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion('version'])); return $info; } } -- cgit v1.2.3 From ba5e60e2e445077769c160b559d44c24ce4cc799 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 14 Apr 2012 19:04:49 +0200 Subject: firefighting Robin-breakage --- lib/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/installer.php') diff --git a/lib/installer.php b/lib/installer.php index 044bc9a13d1..67947279e70 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -297,7 +297,7 @@ class OC_Installer{ include(OC::$APPSROOT."/apps/$app/appinfo/install.php"); } $info=OC_App::getAppInfo($app); - OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion('version'])); + OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion('version')); return $info; } } -- cgit v1.2.3 From c5b8a3eb94be7f7de948215cfdd24ee06690a07a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 15 Apr 2012 11:05:55 +0200 Subject: fix installing shipped apps --- lib/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/installer.php') diff --git a/lib/installer.php b/lib/installer.php index 67947279e70..6edf4ce1b74 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -297,7 +297,7 @@ class OC_Installer{ include(OC::$APPSROOT."/apps/$app/appinfo/install.php"); } $info=OC_App::getAppInfo($app); - OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion('version')); + OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app)); return $info; } } -- cgit v1.2.3