harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

output queue (merges the old deliverq and queue and adds some zotness)

Browse Source
This commit is contained in:
friendica 2012-10-17 16:18:36 -07:00
parent cdeb43f987
commit a680eb3a73
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
database.sql
View File

@ -660,6 +660,24 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
KEY `receiver-uid` (`receiver-uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `outq` (
`outq_hash` char(255) NOT NULL,
`outq_account` int(10) unsigned NOT NULL DEFAULT '0',
`outq_channel` int(10) unsigned NOT NULL DEFAULT '0',
`outq_xchan` char(255) NOT NULL DEFAULT '',
`outq_hub` char(255) NOT NULL DEFAULT '',
`outq_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`outq_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`outq_msg` mediumtext NOT NULL,
PRIMARY KEY (`outq_hash`),
KEY `outq_account` (`outq_account`),
KEY `outq_channel` (`outq_channel`),
KEY `outq_xchan` (`outq_xchan`),
KEY `outq_hub` (`outq_hub`),
KEY `outq_created` (`outq_created`),
KEY `outq_updated` (`outq_updated`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `pconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT '0',

2
include/Photo.php
View File

@ -622,7 +622,7 @@ function guess_image_type($filename, $fromcurl=false) {
}
if (is_null($type)){
// Guessing from extension? Isn't that... dangerous?
if(class_exists('Imagick')) {
if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
/**
* Well, this not much better,
* but at least it comes from the data inside the image,

2
version.inc
View File

@ -1 +1 @@
2012-10-16.109
2012-10-17.110