summaryrefslogtreecommitdiffstats
path: root/lib/installer.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-10-23 16:16:46 +0200
committerRobin Appelman <icewind@owncloud.com>2012-10-23 16:16:46 +0200
commit7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77 (patch)
treee9cf72f3d6813d564baa9c286d0461afd0a27b34 /lib/installer.php
parent707bd68bb4e77b4184b578699d508750653e2d42 (diff)
parentab944094e2c0c9d063cc363a81dbe517c259a466 (diff)
downloadnextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.tar.gz
nextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.zip
merge master into filesystem
Diffstat (limited to 'lib/installer.php')
-rw-r--r--lib/installer.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/installer.php b/lib/installer.php
index 9135c60fc05..56e474bb3b3 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -187,7 +187,7 @@ class OC_Installer{
//run appinfo/install.php
if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')) {
- include($basedir.'/appinfo/install.php');
+ include $basedir.'/appinfo/install.php';
}
//set the installed version
@@ -320,7 +320,7 @@ class OC_Installer{
//run appinfo/install.php
if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")) {
- include(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));