aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/network.php4
-rw-r--r--update.sql21
2 files changed, 1 insertions, 24 deletions
diff --git a/mod/network.php b/mod/network.php
index 4970f69f0..1a68304e8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -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;
}
diff --git a/update.sql b/update.sql
deleted file mode 100644
index ac11812cd..000000000
--- a/update.sql
+++ /dev/null
@@ -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`;
-
---------------