mirror of
https://github.com/friendica/friendica
synced 2024-11-08 11:42:23 +01:00
bare naked linefeed \n crept into SQL
This commit is contained in:
parent
3d7bb9c37c
commit
1f2f483531
|
@ -81,10 +81,8 @@ function network_content(&$a, $update = false) {
|
|||
|
||||
$contacts = expand_groups(array($group));
|
||||
$contact_str = implode(',',$contacts);
|
||||
$sql_extra = dbesc(" AND `item`.`parent` IN
|
||||
( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ");
|
||||
$sql_extra = dbesc(" AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ");
|
||||
|
||||
$sql_extra = dbesc(" AND `contact`.`id` IN ( $contact_str ) ");
|
||||
$o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
|
||||
|
||||
}
|
||||
|
|
21
update.sql
21
update.sql
|
@ -1,21 +0,0 @@
|
|||
CREATE TABLE IF NOT EXISTS `mail` (
|
||||
`id` int(10) unsigned NOT NULL,
|
||||
`uid` int(10) unsigned NOT NULL,
|
||||
`from-name` char(255) NOT NULL,
|
||||
`from-photo` char(255) NOT NULL,
|
||||
`from-url` char(255) NOT NULL,
|
||||
`contact-id` char(255) NOT NULL,
|
||||
`title` char(255) NOT NULL,
|
||||
`body` text NOT NULL,
|
||||
`delivered` tinyint(1) NOT NULL,
|
||||
`seen` tinyint(1) NOT NULL,
|
||||
`replied` tinyint(1) NOT NULL,
|
||||
`uri` char(255) NOT NULL,
|
||||
`parent-uri` char(255) NOT NULL,
|
||||
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
ALTER TABLE `user` ADD `notify-flags` INT(11) UNSIGNED NOT NULL DEFAULT 65535 AFTER `blocked`;
|
||||
|
||||
--------------
|
Loading…
Reference in a new issue