MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Better handling of hidden profiles

Browse source
This commit is contained in:
Michael Vogel 2016-05-04 09:30:55 +02:00
parent 167a8998d6
commit 8992577bb6
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/socgraph.php
View file

@ -1535,6 +1535,7 @@ function update_gcontact($contact) {
unset($fields["url"]); unset($fields["url"]);
unset($fields["updated"]); unset($fields["updated"]);
unset($fields["hide"]);
// Bugfix: We had an error in the storing of keywords which lead to the "0" // Bugfix: We had an error in the storing of keywords which lead to the "0"
// This value is still transmitted via poco. // This value is still transmitted via poco.
@ -1549,6 +1550,11 @@ function update_gcontact($contact) {
if (!isset($contact[$field]) OR ($contact[$field] == "")) if (!isset($contact[$field]) OR ($contact[$field] == ""))
$contact[$field] = $r[0][$field]; $contact[$field] = $r[0][$field];
if (!isset($contact["hide"]))
$contact["hide"] = $r[0]["hide"];
$fields["hide"] = $r[0]["hide"];
if ($contact["network"] == NETWORK_STATUSNET) if ($contact["network"] == NETWORK_STATUSNET)
$contact["network"] = NETWORK_OSTATUS; $contact["network"] = NETWORK_OSTATUS;

10
mod/settings.php
View file

@ -1,6 +1,7 @@
<?php <?php
require_once('include/group.php'); require_once('include/group.php');
require_once('include/socgraph.php');
function get_theme_config_file($theme){ function get_theme_config_file($theme){
$a = get_app(); $a = get_app();
@ -602,7 +603,7 @@ function settings_post(&$a) {
if($name_change) { if($name_change) {
q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1", q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
dbesc($username), dbesc($username),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval(local_user()) intval(local_user())
@ -617,6 +618,13 @@ function settings_post(&$a) {
} }
$r = q("SELECT `url` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
if ($r) {
$gcontact = array("name" => $username, "generation" => 1, "hide" => ($hidewall OR !$net_publish),
"network" => NETWORK_DFRN, "url" => $r[0]["url"], "updated" => datetime_convert());
update_gcontact($gcontact);
}
require_once('include/profile_update.php'); require_once('include/profile_update.php');
profile_change(); profile_change();