From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Thu, 10 Jul 2008 00:51:26 -0400 Subject: Resolve conflicts and convert _t( to _( where it was introduced again. darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz --- classes/Profile.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'classes/Profile.php') diff --git a/classes/Profile.php b/classes/Profile.php index 827339a60..dba7ca8a5 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -31,12 +31,12 @@ class Profile extends DB_DataObject public $__table = 'profile'; // table name public $id; // int(4) primary_key not_null - public $nickname; // varchar(64) not_null - public $fullname; // varchar(255) - public $profileurl; // varchar(255) - public $homepage; // varchar(255) - public $bio; // varchar(140) - public $location; // varchar(255) + public $nickname; // varchar(64) multiple_key not_null + public $fullname; // varchar(255) multiple_key + public $profileurl; // varchar(255) + public $homepage; // varchar(255) multiple_key + public $bio; // varchar(140) multiple_key + public $location; // varchar(255) multiple_key public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP -- cgit v1.2.3-54-g00ecf