aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-06-05 17:51:41 +0200
committerBart Visscher <bartv@thisnet.nl>2012-06-05 17:51:52 +0200
commit9d936976a9c89f183ad7258ac04e047d27900b5e (patch)
treee36e54a4bc1bd88dc317f800967d99e82a9137d1
parent57326ea1f87f9f2d2884fc87c556fec3c6bc378e (diff)
downloadnextcloud-server-9d936976a9c89f183ad7258ac04e047d27900b5e.tar.gz
nextcloud-server-9d936976a9c89f183ad7258ac04e047d27900b5e.zip
Make check for writable apps dir configurable
-rw-r--r--config/config.sample.php5
-rw-r--r--lib/util.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index e86dc05cb01..7ab327e2bce 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -29,6 +29,11 @@ $CONFIG = array(
"log_type" => "",
"logfile" => "",
"loglevel" => "",
+/* Set this to false to disable the check for writable apps dir.
+ * If the apps dir is not writable, you can't download&install extra apps
+ * in the admin apps menu.
+ */
+"writable_appsdir" => true,
// "datadirectory" => ""
);
?>
diff --git a/lib/util.php b/lib/util.php
index 9a1fb7ac370..7a9545e3659 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -31,7 +31,7 @@ class OC_Util {
}
// Check if apps folder is writable.
- if(!is_writable(OC::$SERVERROOT."/apps/")) {
+ if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
$tmpl = new OC_Template( '', 'error', 'guest' );
$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
$tmpl->printPage();