diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
| commit | 7e38142d4aa080767617724a98c0cf60c70961d0 (patch) | |
| tree | d4befe70bb5f82fa78b82465ddec597e1d67f72e /classes | |
| parent | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (diff) | |
Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 7 | ||||
| -rw-r--r-- | classes/Profile.php | 12 | ||||
| -rw-r--r-- | classes/Reply.php | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 5a500a3aa..0ea9763cb 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -33,11 +33,12 @@ class Notice extends DB_DataObject public $id; // int(4) primary_key not_null public $profile_id; // int(4) not_null public $uri; // varchar(255) unique_key - public $content; // varchar(140) - public $url; // varchar(255) + public $content; // varchar(140) + public $rendered; // text() + public $url; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - public $reply_to; // int(4) + public $reply_to; // int(4) /* Static get */ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Notice',$k,$v); } 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 diff --git a/classes/Reply.php b/classes/Reply.php index 507782391..af8f0b098 100644 --- a/classes/Reply.php +++ b/classes/Reply.php @@ -12,9 +12,9 @@ class Reply extends DB_DataObject public $__table = 'reply'; // table name public $notice_id; // int(4) primary_key not_null public $profile_id; // int(4) primary_key not_null - public $replied_id; // int(4) + public $replied_id; // int(4) public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - public $replied_id; // int(4) + public $replied_id; // int(4) /* Static get */ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); } |