summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-05-11 13:56:52 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-05-11 13:56:52 +0200
commit8f2217ca2ecc66842b72f54ff30e7e6e8cda679e (patch)
treea0d1edaa5b9d5a040835d8afacd543a1c99c97e7
parent61d535984df81d5531350cd7895769793722d69e (diff)
downloadnextcloud-server-8f2217ca2ecc66842b72f54ff30e7e6e8cda679e.tar.gz
nextcloud-server-8f2217ca2ecc66842b72f54ff30e7e6e8cda679e.zip
make default app choosable
-rw-r--r--config/config.sample.php1
-rw-r--r--lib/base.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 8561d0a7580..e46c3cacd7e 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -15,6 +15,7 @@ $CONFIG = array(
"theme" => "",
"3rdpartyroot" => "",
"3rdpartyurl" => "",
+"defaultapp" => "files",
"knowledgebaseenabled" => true,
"knowledgebaseurl" => "",
"appstoreenabled" => true,
diff --git a/lib/base.php b/lib/base.php
index a874a604707..7d073481e00 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -424,7 +424,7 @@ class OC{
register_shutdown_function(array('OC_Helper','cleanTmp'));
//parse the given parameters
- self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace('\0', '', strip_tags($_GET['app'])):'files');
+ self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace('\0', '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
if(substr_count(self::$REQUESTEDAPP, '?') != 0){
$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);