better page numbers

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 945309638331ff8008db486ed7a1ba0045b94015..d750c7847296091f6e93e2cf626041bdf77587e7 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -1,18 +1,18 @@
 <?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/>.
  */
@@ -22,6 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
  * Table Definition for user
  */
 require_once 'DB/DataObject.php';
+require_once 'Validate.php';
 
 class User extends DB_DataObject 
 {
@@ -33,6 +34,7 @@ class User extends DB_DataObject
     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
 
@@ -41,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');