diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-22 14:51:17 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-22 14:51:17 -0700 |
commit | 0461aafeef55782056b02cd0d8702ae0a0e3812a (patch) | |
tree | 810c04d3cea406203432122a89d42e991f61c101 /classes/File_oembed.php | |
parent | 5b96523c239609c97012834ec92e8162d868c9f7 (diff) | |
parent | 2c4486401d2303dddd55e4965d4e9770b7b75d45 (diff) |
Merge branch '0.8.x' into cmdline
Diffstat (limited to 'classes/File_oembed.php')
-rw-r--r-- | classes/File_oembed.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/classes/File_oembed.php b/classes/File_oembed.php index 6bf972f8f..51ee57b29 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -1,7 +1,7 @@ <?php /* * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. + * Copyright (C) 2008, 2009, Control Yourself, 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 @@ -31,22 +31,22 @@ class File_oembed extends Memcached_DataObject /* the code below is auto generated do not remove the above tag */ public $__table = 'file_oembed'; // table name - public $id; // int(11) not_null primary_key group_by - public $file_id; // int(11) unique_key group_by + public $file_id; // int(4) primary_key not_null public $version; // varchar(20) public $type; // varchar(20) public $provider; // varchar(50) public $provider_url; // varchar(255) - public $width; // int(11) group_by - public $height; // int(11) group_by - public $html; // blob(65535) blob + public $width; // int(4) + public $height; // int(4) + public $html; // text() public $title; // varchar(255) public $author_name; // varchar(50) public $author_url; // varchar(255) public $url; // varchar(255) + public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP /* Static get */ - function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('File_oembed',$k,$v); } + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_oembed',$k,$v); } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE |