Prefer requested app before redirecting to default page
This commit is contained in:
parent
6404476bec
commit
7a3d606cac
|
@ -324,7 +324,11 @@ class OC_Util {
|
||||||
OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
|
OC_Log::write('core','redirectToDefaultPage',OC_Log::DEBUG);
|
||||||
if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
|
if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
|
||||||
header( 'Location: '.$_REQUEST['redirect_url']);
|
header( 'Location: '.$_REQUEST['redirect_url']);
|
||||||
} else {
|
}
|
||||||
|
else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
|
||||||
|
header( 'Location: '.OC::$WEBROOT.'/?app='.OC::$REQUESTEDAPP );
|
||||||
|
}
|
||||||
|
else {
|
||||||
header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
|
header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
|
||||||
}
|
}
|
||||||
exit();
|
exit();
|
||||||
|
|
Loading…
Reference in New Issue