Merge branch 'dev' into 'dev'

Change llink type in default SQL schema

See merge request hubzilla/core!1761
This commit is contained in:
Max Kostikov 2019-11-02 10:42:02 +01:00
commit 6fd15d66a7
3 changed files with 2 additions and 4 deletions

View File

@ -97,7 +97,7 @@ class Cron {
// Clean expired photos from cache
$sql_interval = db_utcnow() . ' - INTERVAL ' . db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY');
$sql_interval = "'" . dbesc(datetime_convert()) . "' - INTERVAL " . db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY');
$r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < $sql_interval",
intval(PHOTO_CACHE)
);

View File

@ -595,7 +595,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`layout_mid` char(191) NOT NULL DEFAULT '',
`postopts` text NOT NULL,
`route` text NOT NULL,
`llink` char(191) NOT NULL DEFAULT '',
`llink` text NOT NULL,
`plink` text NOT NULL,
`resource_id` char(191) NOT NULL DEFAULT '',
`resource_type` char(16) NOT NULL DEFAULT '',
@ -659,7 +659,6 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `commented` (`commented`),
KEY `verb` (`verb`),
KEY `obj_type` (`obj_type`),
KEY `llink` (`llink`),
KEY `expires` (`expires`),
KEY `revision` (`revision`),
KEY `mimetype` (`mimetype`),

View File

@ -644,7 +644,6 @@ create index "item_resource_type" on item ("resource_type");
create index "item_commented" on item ("commented");
create index "item_verb" on item ("verb");
create index "item_obj_type" on item ("obj_type");
create index "item_llink" on item ("llink");
create index "item_expires" on item ("expires");
create index "item_revision" on item ("revision");
create index "item_mimetype" on item ("mimetype");