Merge conflicts and kill a whole lot of trailing whitespace on lines.

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

diff --git a/classes/User.php b/classes/User.php
index ab550b8e1a47ea71770e5df611505f7151720df9..b928b69cacb2a63e19cdc7387dc44ec9cd996191 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
 require_once 'DB/DataObject.php';
 require_once 'Validate.php';
 
-class User extends DB_DataObject 
+class User extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -32,14 +32,14 @@ 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 $password;                        // varchar(255)
     public $email;                           // varchar(255)  unique_key
     public $jabber;                          // varchar(255)  unique_key
-    public $jabbernotify;                    // tinyint(1)  
-    public $updatefrompresence;              // tinyint(1)  
+    public $jabbernotify;                    // tinyint(1)
+    public $updatefrompresence;              // tinyint(1)
     public $sms;                             // varchar(64)  unique_key
-    public $carrier;                         // int(4)  
-    public $smsnotify;                       // tinyint(1)  
+    public $carrier;                         // int(4)
+    public $smsnotify;                       // tinyint(1)
     public $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -69,7 +69,7 @@ class User extends DB_DataObject
        }
 
        # 'update' won't write key columns, so we have to do it ourselves.
-       
+
        function updateKeys(&$orig) {
                $parts = array();
                foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
@@ -82,11 +82,11 @@ class User extends DB_DataObject
                        return true;
                }
                $toupdate = implode(', ', $parts);
-               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . 
+               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
                  ' WHERE id = ' . $this->id;
                return $this->query($qry);
        }
-       
+
        function allowed_nickname($nickname) {
                # XXX: should already be validated for size, content, etc.
                static $blacklist = array('rss', 'xrds', 'doc', 'main',