keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bare naked linefeed \n crept into SQL

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-11 21:45:27 -07:00
parent 3d7bb9c37c
commit 1f2f483531
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/network.php
View file

@ -81,10 +81,8 @@ function network_content(&$a, $update = false) {
$contacts = expand_groups(array($group)); $contacts = expand_groups(array($group));
$contact_str = implode(',',$contacts); $contact_str = implode(',',$contacts);
$sql_extra = dbesc(" AND `item`.`parent` IN $sql_extra = dbesc(" AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ");
( 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; $o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
} }

21
update.sql
View file

@ -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`;
--------------