From 3ab845dcf339201e0fbb982badb976bb2f7db757 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 1 Mar 2017 21:47:10 +0000 Subject: [PATCH 1/2] Issue 3196: Not all forum posts weren't shown --- mod/profile.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mod/profile.php b/mod/profile.php index 5dd8293c7..88d8683b8 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -282,14 +282,12 @@ function profile_content(App $a, $update = 0) { STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` WHERE `thread`.`uid` = %d AND `thread`.`visible` - AND `thread`.`contact-id` = %d AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` AND `thread`.`wall` $sql_extra $sql_extra2 ORDER BY `thread`.`created` DESC $pager_sql", - intval($a->profile['profile_uid']), - intval($a->profile['contact_id']) + intval($a->profile['profile_uid']) ); } From 5c92e971733b404f42b06f2a8c0f2be7ac6dad0d Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 2 Mar 2017 05:46:44 +0000 Subject: [PATCH 2/2] Added index for performance issues --- boot.php | 2 +- database.sql | 8 +++++--- include/dbstructure.php | 1 + update.php | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 1e0c300e1..832a95de4 100644 --- a/boot.php +++ b/boot.php @@ -40,7 +40,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.1-rc' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1214 ); +define ( 'DB_UPDATE_VERSION', 1215 ); /** * @brief Constant with a HTML line break. diff --git a/database.sql b/database.sql index 64d8d9f7d..b133489e4 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 3.5.1-dev (Asparagus) --- DB_UPDATE_VERSION 1213 +-- Friendica 3.5.1-rc (Asparagus) +-- DB_UPDATE_VERSION 1215 -- ------------------------------------------ @@ -532,6 +532,7 @@ CREATE TABLE IF NOT EXISTS `item` ( INDEX `parent-uri` (`parent-uri`), INDEX `extid` (`extid`), INDEX `uid_id` (`uid`,`id`), + INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`), INDEX `uid_created` (`uid`,`created`), INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), INDEX `uid_network_received` (`uid`,`network`,`received`), @@ -1016,7 +1017,8 @@ CREATE TABLE IF NOT EXISTS `thread` ( INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`), INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`), INDEX `uid_created` (`uid`,`created`), - INDEX `uid_commented` (`uid`,`commented`) + INDEX `uid_commented` (`uid`,`commented`), + INDEX `uid_wall_created` (`uid`,`wall`,`created`) ) DEFAULT CHARSET=utf8mb4; -- diff --git a/include/dbstructure.php b/include/dbstructure.php index 1e4790de2..4ad54e6ba 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1526,6 +1526,7 @@ function db_definition($charset) { "uid_contactid_created" => array("uid","contact-id","created"), "uid_created" => array("uid","created"), "uid_commented" => array("uid","commented"), + "uid_wall_created" => array("uid","wall","created"), ) ); $database["tokens"] = array( diff --git a/update.php b/update.php index 041de9cff..64259bbb1 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@