X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=d750c7847296091f6e93e2cf626041bdf77587e7;hb=9bb55af26f47d960cc33b02ec355d832d18b31b7;hp=e7d297b3c6947eaab61481301b88d85f5deb897d;hpb=b6cfd2dffeeb733f07818db5f4ce11d4b3d51771;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index e7d297b3c6..d750c78472 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -1,27 +1,28 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
 /**
  * Table Definition for user
  */
 require_once 'DB/DataObject.php';
+require_once 'Validate.php';
 
 class User extends DB_DataObject 
 {
@@ -30,8 +31,10 @@ class User extends DB_DataObject
 
     public $__table = 'user';                            // table name
     public $id;                              // int(4)  primary_key not_null
+    public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
+    public $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
@@ -40,11 +43,17 @@ class User extends DB_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-	
+
 	function getProfile() {
-		return Profile::staticGet($this->$id);
+		$profile = DB_DataObject::factory('profile');
+		$profile->id = $this->id;
+		if ($profile->find()) {
+			$profile->fetch();
+			return $profile;
+		}
+		return NULL;
 	}
-	
+
 	function isSubscribed($other) {
 		assert(!is_null($other));
 		$sub = DB_DataObject::factory('subscription');