diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-08-01 10:21:33 +0100 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-08-01 10:21:33 +0100 |
| commit | e7f7693b2f28ad87c232db51f1101e720fb29623 (patch) | |
| tree | a83f184a42135fb3a5ae7ffa2e5cfd9d51147e20 /lib | |
| parent | 9ec035e3d372634c633b2a3617566299788797f1 (diff) | |
| download | nextcloud-server-e7f7693b2f28ad87c232db51f1101e720fb29623.tar.gz nextcloud-server-e7f7693b2f28ad87c232db51f1101e720fb29623.zip | |
Fix 3rdparty paths, initialise OAuth in correct order
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oauth.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/oauth.php b/lib/oauth.php index 09dbe4cc755..0c6e9af7252 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -37,12 +37,13 @@ class OC_OAuth { */ private static function init(){ // Include the libraries - require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthServer.php'); - require_once(OC::$THIRDPARTYROOT.'3rdparty/oauth-php/library/OAuthStore.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthServer.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthStore.php'); + require_once(OC::$THIRDPARTYROOT.'/3rdparty/oauth-php/library/OAuthRequestVerifier.php'); + // Initialise the OAuth store + self::$store = OAuthStore::instance('Session'); // Create the server object self::$server = new OAuthServer(); - // Initialise the OAuth store - self::$store = OAuthStore::instance('owncloud'); } /** @@ -109,6 +110,7 @@ class OC_OAuth { * @return string|int */ public static function isAuthorised(){ + self::init(); if(OAuthRequestVerifier::requestIsSigned()){ try{ $req = new OAuthRequestVerifier(); |