summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-17 23:56:42 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-17 23:56:42 -0700
commit79e732bd03c020eab36ceb13c5a712e76df3ac75 (patch)
tree48cd2d1b916a8f53beefa6c856677eb5278921f1 /classes/User.php
parent19d39b20294bad8dc14df26e76756c558a5083cf (diff)
parentc14c9e1a086f0de29ef5c37fbeb34f6082b1c5ef (diff)
Merge branch '0.8.x' into twitterpriv
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/classes/User.php b/classes/User.php
index 08a166d5a..c7eede94e 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -62,14 +62,13 @@ class User extends Memcached_DataObject
public $autosubscribe; // tinyint(1)
public $urlshorteningservice; // varchar(50) default_ur1.ca
public $inboxed; // tinyint(1)
+ public $design_id; // int(4)
+ public $viewdesigns; // tinyint(1) default_1
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
/* Static get */
- function staticGet($k,$v=NULL)
- {
- return Memcached_DataObject::staticGet('User',$k,$v);
- }
+ function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User',$k,$v); }
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@ -684,4 +683,9 @@ class User extends Memcached_DataObject
return ($cnt > 0);
}
+
+ function getDesign()
+ {
+ return Design::staticGet('id', $this->design_id);
+ }
}