diff options
| author | Sam Tuke <sam@donttravelempty.com> | 2012-05-11 13:18:51 +0100 |
|---|---|---|
| committer | Sam Tuke <sam@donttravelempty.com> | 2012-05-11 13:18:51 +0100 |
| commit | e98305fa6516991fef137b430f9bf0ead8e9a688 (patch) | |
| tree | 446efe97231d7d24a95d8c30082876473da9e231 | |
| parent | 03fad9776427e4fad1615dc0d76d26b1efc7c421 (diff) | |
| parent | 8f2217ca2ecc66842b72f54ff30e7e6e8cda679e (diff) | |
| download | nextcloud-server-e98305fa6516991fef137b430f9bf0ead8e9a688.tar.gz nextcloud-server-e98305fa6516991fef137b430f9bf0ead8e9a688.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | config/config.sample.php | 1 | ||||
| -rw-r--r-- | lib/base.php | 2 |
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); |