From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 27 Apr 2012 08:30:50 +0000 (+0200)
Subject: Merge branch 'master' into movable_apps_2
X-Git-Tag: v4.0.0beta~168^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=993d655aad8be57f4421fa787fc573bcfcc417e1;p=nextcloud-server.git

Merge branch 'master' into movable_apps_2
---

993d655aad8be57f4421fa787fc573bcfcc417e1
diff --cc index.php
index 787485555fb,9fff459807e..fe8f7f15038
--- a/index.php
+++ b/index.php
@@@ -55,18 -54,14 +55,17 @@@ elseif(OC_User::isLoggedIn()) 
  		OC_User::logout();
  		header("Location: ".OC::$WEBROOT.'/');
  		exit();
 -	}
 -	else {
 -		OC_Util::redirectToDefaultPage();
 +	}else{
 +		if(is_null(OC::$REQUESTEDFILE)){
 +			OC::loadapp();
 +		}else{
 +			OC::loadfile();
 +		}
 +		
  	}
- }
  
  // For all others cases, we display the guest page :
- else {
+ } else {
  	OC_App::loadApps();
  	$error = false;