Merge branch 'compound-keys-fix' into 1.0.x

[quix0rs-gnu-social.git] / plugins / OpenID / openidserver.php

diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index b2cf1f8ac35fc3bed4351b7ec508a90ba99f6d31..847eb48c65fbb773b7a9d585eea81951a1bf414a 100644 (file)
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -28,13 +28,11 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 /**
  * Settings for OpenID
@@ -115,6 +113,7 @@ class OpenidserverAction extends Action
             } else {
                 //invalid
                 // TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+                // TRANS: %s is a request identity.
                 $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403);
             }
         } else {
@@ -142,7 +141,7 @@ class OpenidserverAction extends Action
 
     function generateAllowResponse($request, $user){
         $response = $request->answer(true, null, common_profile_url($user->nickname));
-        
+
         $profile = $user->getProfile();
         $sreg_data = array(
             'fullname' => $profile->fullname,