Make check for writable apps dir configurable

diff --git a/config/config.sample.php b/config/config.sample.php
index e86dc05cb01b8a0aa8d66b47de290d4298b052c3..7ab327e2bce9da619c590e5ebfba0e6fded74371 100644 (file)
--- 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 9a1fb7ac37054efd563e9217e6323251835951c2..7a9545e36592c23060e466641b127cb70dbfd347 100644 (file)
--- 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();