Merge pull request #6461 from annando/contacts-post

Private posts of contacts hadn't been displayed on the contact's page

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index edfdda8737bd821a01c4d600d36a1b05dc81c754..71aaae8d4eb8948e3e01f8fe19399c011ce725ae 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -83,10 +83,6 @@ function nodeinfo_init(App $a) {
                        $nodeinfo['services']['inbound'][] = 'gnusocial';
                        $nodeinfo['services']['outbound'][] = 'gnusocial';
                }
-
-               if (Addon::isEnabled('gpluspost') || Addon::isEnabled('buffer')) {
-                       $nodeinfo['services']['outbound'][] = 'google';
-               }
                if (Addon::isEnabled('ijpost')) {
                        $nodeinfo['services']['outbound'][] = 'insanejournal';
                }

diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index d1d957076f28903442c0ed71adb56f9b37b401ba..e3577083b4f7fe0657e9eb93cb32333c9a59cdbf 100644 (file)
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -34,7 +34,6 @@ function statistics_json_init(App $a) {
        $statistics["services"]["buffer"] = Addon::isEnabled("buffer");
        $statistics["services"]["dreamwidth"] = Addon::isEnabled("dwpost");
        $statistics["services"]["gnusocial"] = Addon::isEnabled("statusnet");
-       $statistics["services"]["googleplus"] = Addon::isEnabled("gpluspost");
        $statistics["services"]["libertree"] = Addon::isEnabled("libertree");
        $statistics["services"]["livejournal"] = Addon::isEnabled("ljpost");
        $statistics["services"]["pumpio"] = Addon::isEnabled("pumpio");
@@ -47,7 +46,6 @@ function statistics_json_init(App $a) {
        $statistics["buffer"] = $statistics["services"]["buffer"];
        $statistics["dreamwidth"] = $statistics["services"]["dreamwidth"];
        $statistics["gnusocial"] = $statistics["services"]["gnusocial"];
-       $statistics["googleplus"] = $statistics["services"]["googleplus"];
        $statistics["libertree"] = $statistics["services"]["libertree"];
        $statistics["livejournal"] = $statistics["services"]["livejournal"];
        $statistics["pumpio"] = $statistics["services"]["pumpio"];