Merge branch '1.1.x'

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

diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index 1beff9ea304afebbeeec5c1391137ae0c802c2df..03a0b0ccd993b8a676201d12a8a074a5716f7563 100644 (file)
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,7 +2,10 @@
 /**
  * Table Definition for user_openid
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class User_openid extends Memcached_DataObject
 {
@@ -25,7 +28,6 @@ class User_openid extends Memcached_DataObject
 
     function table()
     {
-
         $db = $this->getDatabaseConnection();
         $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
 
@@ -61,7 +63,7 @@ class User_openid extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    Static function hasOpenID($user_id)
+    static function hasOpenID($user_id)
     {
         $oid = new User_openid();