Merge branch 'master' of gitorious.org:owncloud/owncloud
This commit is contained in:
commit
e98305fa65
|
@ -15,6 +15,7 @@ $CONFIG = array(
|
||||||
"theme" => "",
|
"theme" => "",
|
||||||
"3rdpartyroot" => "",
|
"3rdpartyroot" => "",
|
||||||
"3rdpartyurl" => "",
|
"3rdpartyurl" => "",
|
||||||
|
"defaultapp" => "files",
|
||||||
"knowledgebaseenabled" => true,
|
"knowledgebaseenabled" => true,
|
||||||
"knowledgebaseurl" => "",
|
"knowledgebaseurl" => "",
|
||||||
"appstoreenabled" => true,
|
"appstoreenabled" => true,
|
||||||
|
|
|
@ -424,7 +424,7 @@ class OC{
|
||||||
register_shutdown_function(array('OC_Helper','cleanTmp'));
|
register_shutdown_function(array('OC_Helper','cleanTmp'));
|
||||||
|
|
||||||
//parse the given parameters
|
//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){
|
if(substr_count(self::$REQUESTEDAPP, '?') != 0){
|
||||||
$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
|
$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
|
||||||
$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);
|
$param = substr(self::$REQUESTEDAPP, strpos(self::$REQUESTEDAPP, '?') + 1);
|
||||||
|
|
Loading…
Reference in New Issue