From b9de8022a941e6cb7c920fc865d8044ab6fffa09 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Mon, 25 Jun 2018 21:47:57 +0200
Subject: [PATCH] [auto] plugin: pubsubhubbub 2.2.2
---
wp-content/plugins/pubsubhubbub/.svnignore | 1 +
wp-content/plugins/pubsubhubbub/LICENSE | 21 +++++++++++
.../pubsubhubbub/includes/functions.php | 4 +--
.../pubsubhubbub/languages/pubsubhubbub.pot | 36 ++++++++++++-------
.../plugins/pubsubhubbub/pubsubhubbub.php | 4 +--
wp-content/plugins/pubsubhubbub/readme.txt | 16 ++++++---
.../pubsubhubbub/templates/settings-page.php | 16 ++++++++-
7 files changed, 76 insertions(+), 22 deletions(-)
create mode 100644 wp-content/plugins/pubsubhubbub/LICENSE
diff --git a/wp-content/plugins/pubsubhubbub/.svnignore b/wp-content/plugins/pubsubhubbub/.svnignore
index b90460a4b..33a3580e9 100644
--- a/wp-content/plugins/pubsubhubbub/.svnignore
+++ b/wp-content/plugins/pubsubhubbub/.svnignore
@@ -28,3 +28,4 @@ phpunit.xml.dist
tests
node_modules
vendor
+package-lock.json
diff --git a/wp-content/plugins/pubsubhubbub/LICENSE b/wp-content/plugins/pubsubhubbub/LICENSE
new file mode 100644
index 000000000..93a1627fe
--- /dev/null
+++ b/wp-content/plugins/pubsubhubbub/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Matthias Pfefferle, Josh Fraser
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/wp-content/plugins/pubsubhubbub/includes/functions.php b/wp-content/plugins/pubsubhubbub/includes/functions.php
index 1b2bf90ea..ca015fe87 100644
--- a/wp-content/plugins/pubsubhubbub/includes/functions.php
+++ b/wp-content/plugins/pubsubhubbub/includes/functions.php
@@ -81,8 +81,8 @@ function pubsubhubbub_get_topic_urls() {
get_bloginfo( 'atom_url' ),
get_bloginfo( 'rdf_url' ),
get_bloginfo( 'rss2_url' ),
- get_bloginfo( 'comments_atom_url' ),
- get_bloginfo( 'comments_rss2_url' ),
+ //get_bloginfo( 'comments_atom_url' ),
+ //get_bloginfo( 'comments_rss2_url' ),
);
$feeds = get_option( 'pubsubhubbub_topic_urls', $default_feeds );
diff --git a/wp-content/plugins/pubsubhubbub/languages/pubsubhubbub.pot b/wp-content/plugins/pubsubhubbub/languages/pubsubhubbub.pot
index 81fa5103e..8be411eef 100644
--- a/wp-content/plugins/pubsubhubbub/languages/pubsubhubbub.pot
+++ b/wp-content/plugins/pubsubhubbub/languages/pubsubhubbub.pot
@@ -1,36 +1,46 @@
-# Copyright (C) 2017 Matthias Pfefferle
-# This file is distributed under the same license as the WebSub/PubSubHubbub package.
+# Copyright (C) 2018 Matthias Pfefferle
+# This file is distributed under the MIT.
msgid ""
msgstr ""
-"Project-Id-Version: WebSub/PubSubHubbub 1.7.2\n"
+"Project-Id-Version: WebSub/PubSubHubbub 2.2.1\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/pubsubhubbub\n"
-"POT-Creation-Date: 2017-05-01 20:24:15+00:00\n"
+"POT-Creation-Date: 2018-02-04 19:41:40+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"X-Generator: grunt-wp-i18n 0.5.4\n"
-#: pubsubhubbub.php:152
+#: pubsubhubbub.php:153
msgid "Settings"
msgstr ""
-#: templates/settings-page.php:2
+#. Plugin Name of the plugin/theme
+msgid "WebSub/PubSubHubbub"
+msgstr ""
+
+#: templates/settings-page.php:4
msgid "Define custom hubs"
msgstr ""
-#: templates/settings-page.php:17
+#: templates/settings-page.php:19
msgid "Hubs (one per line)"
msgstr ""
-#: templates/settings-page.php:26
-msgid "Thanks for using WebSub/PubSubHubbub!"
+#: templates/settings-page.php:28
+msgid "Topic URLs"
msgstr ""
-#. Plugin Name of the plugin/theme
-msgid "WebSub/PubSubHubbub"
+#: templates/settings-page.php:30
+msgid ""
+"These topic URLs will be send to the hub if you post a new, or update an "
+"existing post:"
+msgstr ""
+
+#: templates/settings-page.php:40
+msgid "Thanks for using WebSub/PubSubHubbub!"
msgstr ""
#. Plugin URI of the plugin/theme
@@ -46,5 +56,5 @@ msgid "Matthias Pfefferle"
msgstr ""
#. Author URI of the plugin/theme
-msgid "https://wordpress.org/plugins/pubsubhubbub/"
+msgid "https://notiz.blog/"
msgstr ""
\ No newline at end of file
diff --git a/wp-content/plugins/pubsubhubbub/pubsubhubbub.php b/wp-content/plugins/pubsubhubbub/pubsubhubbub.php
index bf00ec965..b9ff681cd 100755
--- a/wp-content/plugins/pubsubhubbub/pubsubhubbub.php
+++ b/wp-content/plugins/pubsubhubbub/pubsubhubbub.php
@@ -3,7 +3,7 @@
* Plugin Name: WebSub/PubSubHubbub
* Plugin URI: https://github.com/pubsubhubbub/wordpress-pubsubhubbub/
* Description: A better way to tell the world when your blog is updated.
- * Version: 2.2.0
+ * Version: 2.2.2
* Author: Matthias Pfefferle
* Author URI: https://notiz.blog/
* License: MIT
@@ -24,7 +24,7 @@ class PubSubHubbub_Plugin {
require_once( dirname( __FILE__ ) . '/includes/functions.php' );
add_action( 'publish_post', array( 'PubSubHubbub_Plugin', 'publish_post' ) );
- add_action( 'comment_post', array( 'PubSubHubbub_Plugin', 'publish_comment' ) );
+ //add_action( 'comment_post', array( 'PubSubHubbub_Plugin', 'publish_comment' ) );
add_action( 'atom_head', array( 'PubSubHubbub_Plugin', 'add_atom_link_tag' ) );
add_action( 'comments_atom_head', array( 'PubSubHubbub_Plugin', 'add_atom_link_tag' ) );
diff --git a/wp-content/plugins/pubsubhubbub/readme.txt b/wp-content/plugins/pubsubhubbub/readme.txt
index 2f1500386..4d2d86d7e 100644
--- a/wp-content/plugins/pubsubhubbub/readme.txt
+++ b/wp-content/plugins/pubsubhubbub/readme.txt
@@ -1,16 +1,16 @@
=== WebSub/PubSubHubbub ===
Contributors: pfefferle, joshfraz
-Donate link: http://14101978.de
+Donate link: https://notiz.blog/donate/
Tags: webhooks, websub, puhsubhubbub, pubsub, ping, push, indieweb, openweb, ostatus
Requires at least: 4.5
-Tested up to: 4.8
-Stable tag: 2.2.0
+Tested up to: 4.9.6
+Stable tag: 2.2.2
A better way to tell the world when your blog is updated.
== Description ==
-This plugin is a simple way to let people know in real-time when your blog is updated. PubSubHubbub is widely adopted and is used by Google Reader, Google Alerts and many other services. WebSub provides a common mechanism for communication between publishers of any kind of Web content and their subscribers, based on HTTP web hooks. Subscription requests are relayed through hubs, which validate and verify the request. Hubs then distribute new and updated content to subscribers when it becomes available. WebSub was previously known as PubSubHubbub.
+This plugin is a simple way to let people know in real-time when your blog is updated. PubSubHubbub is widely adopted and is used by Google Reader, Google Alerts and many other services. The latest version of the spec is called WebSub, and is developed by the W3C. Subscription requests are relayed through hubs, which validate and verify the request. Hubs then distribute new and updated content to subscribers when it becomes available.
This plugin:
@@ -55,6 +55,14 @@ You can visit [PubsSubHubbub on Github](https://github.com/pubsubhubbub "PubsSub
Project maintained on github at [pubsubhubbub/wordpress-pubsubhubbub](https://github.com/pubsubhubbub/wordpress-pubsubhubbub).
+= 2.2.2 =
+
+* temporarily remove comment-feed support to be more GDPR compliant
+
+= 2.2.1 =
+
+* display topic URLs on the settings page
+
= 2.2.0 =
* fixed a discovery bug
diff --git a/wp-content/plugins/pubsubhubbub/templates/settings-page.php b/wp-content/plugins/pubsubhubbub/templates/settings-page.php
index 7a472af28..450a3ef3a 100644
--- a/wp-content/plugins/pubsubhubbub/templates/settings-page.php
+++ b/wp-content/plugins/pubsubhubbub/templates/settings-page.php
@@ -1,5 +1,7 @@
<div class="wrap">
-<h2><?php _e( 'Define custom hubs', 'pubsubhubbub' ); ?></h2>
+<h2><?php _e( 'WebSub/PubSubHubbub', 'pubsubhubbub' ); ?></h2>
+
+<h3><?php _e( 'Define custom hubs', 'pubsubhubbub' ); ?></h3>
<form method="post" action="options.php">
<!-- starting -->
@@ -23,5 +25,17 @@ $pubsubhubbub_endpoints = trim( implode( PHP_EOL, pubsubhubbub_get_hubs() ), PHP
</form>
+<h3><?php _e( 'Topic URLs', 'pubsubhubbub' ); ?></h3>
+
+<p><?php _e( 'These topic URLs will be send to the hub if you post a new, or update an existing post:', 'pubsubhubbub' ); ?></p>
+
+<ul>
+<?php foreach ( pubsubhubbub_get_topic_urls() as $topic_url ) { ?>
+ <li><pre><?php echo $topic_url; ?></pre></li>
+<?php } ?>
+</ul>
+
+<hr />
+
<p><strong><?php _e( 'Thanks for using WebSub/PubSubHubbub!', 'pubsubhubbub' ); ?></strong></p>
</div>
--
GitLab