summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-06-18 12:44:06 +0200
committerBart Visscher <bartv@thisnet.nl>2012-06-18 15:40:48 +0200
commit79f9d61ec84041c61a8d00042dfeb28afd8219a6 (patch)
tree60b196d5bf96175880c64606226103dca7df056a
parent405ac36e0c34ec03fc00eab1ee57520c34cd7d28 (diff)
downloadnextcloud-server-79f9d61ec84041c61a8d00042dfeb28afd8219a6.tar.gz
nextcloud-server-79f9d61ec84041c61a8d00042dfeb28afd8219a6.zip
Allow apps to load before login, needed for user_openid
-rw-r--r--apps/user_openid/appinfo/info.xml1
-rwxr-xr-xindex.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
index 268af239738..7aae4271fa8 100644
--- a/apps/user_openid/appinfo/info.xml
+++ b/apps/user_openid/appinfo/info.xml
@@ -8,6 +8,7 @@
<require>4</require>
<shipped>true</shipped>
<types>
+ <prelogin/>
<authentication/>
</types>
</info>
diff --git a/index.php b/index.php
index 32b3c88df1d..1171c0fe0cf 100755
--- a/index.php
+++ b/index.php
@@ -69,6 +69,7 @@ elseif(OC_User::isLoggedIn()) {
// For all others cases, we display the guest page :
} else {
+ OC_App::loadApps(array('prelogin'));
$error = false;
// remember was checked after last login
if(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {