tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Reverted some work ...

Browse source
This commit is contained in:
Michael Vogel 2016-01-28 11:14:13 +01:00
parent 78e79de7c9
commit 04725d1283
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/socgraph.php
View file

@ -10,7 +10,6 @@
require_once('include/datetime.php'); require_once('include/datetime.php');
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/html2bbcode.php"); require_once("include/html2bbcode.php");
require_once("include/Contact.php");
/* /*
* poco_load * poco_load
@ -1553,7 +1552,6 @@ function update_gcontact($contact) {
$update = true; $update = true;
if ($update) { if ($update) {
q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s', q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
`birthday` = '%s', `gender` = '%s', `keywords` = %d, `hide` = %d, `nsfw` = %d, `birthday` = '%s', `gender` = '%s', `keywords` = %d, `hide` = %d, `nsfw` = %d,
`alias` = '%s', `notify` = '%s', `url` = '%s', `alias` = '%s', `notify` = '%s', `url` = '%s',

5
mod/poco.php
View file

@ -179,9 +179,6 @@ function poco_init(&$a) {
$rr['generation'] = 2; $rr['generation'] = 2;
} }
if ($rr["avatar"] == "")
$rr["avatar"] = $rr["photo"];
if (($rr['about'] == "") AND isset($rr['pabout'])) if (($rr['about'] == "") AND isset($rr['pabout']))
$rr['about'] = $rr['pabout']; $rr['about'] = $rr['pabout'];
@ -261,7 +258,7 @@ function poco_init(&$a) {
$entry['updated'] = date("c", strtotime($entry['updated'])); $entry['updated'] = date("c", strtotime($entry['updated']));
} }
if($fields_ret['photos']) if($fields_ret['photos'])
$entry['photos'] = array(array('value' => $rr['avatar'], 'type' => 'profile')); $entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
if($fields_ret['network']) { if($fields_ret['network']) {
$entry['network'] = $rr['network']; $entry['network'] = $rr['network'];
if ($entry['network'] == NETWORK_STATUSNET) if ($entry['network'] == NETWORK_STATUSNET)