From c829dc8e71e51e62a2573a262c017bf2472439c4 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 28 Feb 2017 06:26:50 +0000 Subject: [PATCH 1/5] The service at gstools.org doesn't exist anymore. --- include/discover_poco.php | 4 ++++ include/socgraph.php | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/discover_poco.php b/include/discover_poco.php index 814636878..10c741ae5 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -186,6 +186,10 @@ function discover_directory($search) { */ function gs_search_user($search) { + // Currently disabled, since the service isn't available anymore. + // It is not removed since I hope that there will be a successor. + return false; + $a = get_app(); $url = "http://gstools.org/api/users_search/".urlencode($search); diff --git a/include/socgraph.php b/include/socgraph.php index a0dd88df2..0ed209460 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1244,18 +1244,20 @@ function poco_discover_federation() { poco_check_server("https://".$server->host); } - // Discover GNU Social Servers - if (!get_config('system','ostatus_disabled')) { - $serverdata = "http://gstools.org/api/get_open_instances/"; + // Currently disabled, since the service isn't available anymore. + // It is not removed since I hope that there will be a successor. + // Discover GNU Social Servers. + //if (!get_config('system','ostatus_disabled')) { + // $serverdata = "http://gstools.org/api/get_open_instances/"; - $result = z_fetch_url($serverdata); - if ($result["success"]) { - $servers = json_decode($result["body"]); + // $result = z_fetch_url($serverdata); + // if ($result["success"]) { + // $servers = json_decode($result["body"]); - foreach($servers->data AS $server) - poco_check_server($server->instance_address); - } - } + // foreach($servers->data AS $server) + // poco_check_server($server->instance_address); + // } + //} set_config('poco','last_federation_discovery', time()); } From 59bfc3f4a86dbbebd2263eb62081c6343c2872e2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Feb 2017 08:21:33 +0100 Subject: [PATCH 2/5] this line is superfluous by now --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ef8f124ca..73ef005e9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,7 +33,6 @@ Version 3.5.1 ping now works with JSON as well [Hypolite] On pending registrations, an email is now send to inform the user about it [tobiasd] On systems where the registration needs approval, a note for the admin can now be written [tobiasd] - Theme developers can now announce if their theme does support the RichText editor or not [heluecht, rabuzarus] Meta Information for HTML descriptions is now limited to 160 character [rabuzarus] Removed very old deprecated themes from the repository [silke] Marked frost and frost mobile as deprecated [silke] From 3ab845dcf339201e0fbb982badb976bb2f7db757 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 1 Mar 2017 21:47:10 +0000 Subject: [PATCH 3/5] 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 4/5] 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 @@ Date: Thu, 2 Mar 2017 09:05:24 +0100 Subject: [PATCH 5/5] issues solved --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 73ef005e9..e2479ce77 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,7 +63,7 @@ Version 3.5.1 2850, 2858, 2865, 2892, 2894, 2895, 2907, 2908, 2914, 2015, 2926, 2948, 2955, 2958, 2963, 2964, 2968, 2987, 2993, 3020, 3052, 3062, 3066, 3091, 3108, 3113, 3116, 3117, 3118, 3126, 3130, 3135, 3155, - 3163 + 3160, 3163, 3196 Version 3.5 (2016-09-13) Friendica Core: