clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OStatus auto completion: option to completely disable the auto completion.

This commit is contained in:
Michael Vogel 2014-03-16 18:09:42 +01:00
parent 285f0774a1
commit b23dd95c5e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ostatus_conversation.php
View File

@ -44,6 +44,9 @@ function check_conversations() {
function complete_conversation($itemid, $conversation_url, $only_add_conversation = false) { function complete_conversation($itemid, $conversation_url, $only_add_conversation = false) {
global $a; global $a;
if (intval(get_config('system','ostatus_poll_interval')) == -2)
return;
if ($a->last_ostatus_conversation_url == $conversation_url) if ($a->last_ostatus_conversation_url == $conversation_url)
return; return;
@ -141,7 +144,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
if ($message_exists) { if ($message_exists) {
if ($parent["id"] != 0) { if ($parent["id"] != 0) {
$existing_message = $message_exists[0]; $existing_message = $message_exists[0];
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1", $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d",
intval($parent["id"]), intval($parent["id"]),
dbesc($parent["uri"]), dbesc($parent["uri"]),
dbesc($parent_uri), dbesc($parent_uri),

11
mod/admin.php
View File

@ -526,11 +526,12 @@ function admin_page_site(&$a) {
/* OStatus conversation poll choices */ /* OStatus conversation poll choices */
$ostatus_poll_choices = array( $ostatus_poll_choices = array(
"-1" => t("Never"), "-2" => t("Never"),
"0" => t("Frequently"), "-1" => t("At post arrival"),
"60" => t("Hourly"), "0" => t("Frequently"),
"720" => t("Twice daily"), "60" => t("Hourly"),
"1440" => t("Daily") "720" => t("Twice daily"),
"1440" => t("Daily")
); );
/* get user names to make the install a personal install of X */ /* get user names to make the install a personal install of X */