Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments

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

diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php
index ed6ca73a47f71ca11e84d8cbf32f30c8a459f163..89f3150f6358344eda2fb832e2f137d2f8723489 100644 (file)
--- a/plugins/OpenID/openidtrust.php
+++ b/plugins/OpenID/openidtrust.php
@@ -17,10 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 class OpenidtrustAction extends Action
 {