Reverted some work ...

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

diff --git a/mod/poco.php b/mod/poco.php
index 3927f125ea23030d5add4056be76b13b781afc81..0a1b392169b22dbf3e5748bb4ebbbebc8aa65a25 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -179,9 +179,6 @@ function poco_init(&$a) {
                                                $rr['generation'] = 2;
                                }
 
-                               if ($rr["avatar"] == "")
-                                       $rr["avatar"] = $rr["photo"];
-
                                if (($rr['about'] == "") AND isset($rr['pabout']))
                                        $rr['about'] = $rr['pabout'];
 
@@ -261,7 +258,7 @@ function poco_init(&$a) {
                                        $entry['updated'] = date("c", strtotime($entry['updated']));
                                }
                                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']) {
                                        $entry['network'] = $rr['network'];
                                        if ($entry['network'] == NETWORK_STATUSNET)