Merge branch 'develop'

10up-experience.php

@@ -3,7 +3,7 @@
  * Plugin Name:       10up Experience
  * Plugin URI:        https://github.com/10up/10up-experience
  * Description:       The 10up Experience plugin configures WordPress to better protect and inform clients, aligned to 10up’s best practices.
- * Version:           1.11.2
+ * Version:           1.12.0
  * Author:            10up
  * Author URI:        https://10up.com
  * License:           GPLv2 or later
@@ -19,7 +19,7 @@
 
 use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
 
-define( 'TENUP_EXPERIENCE_VERSION', '1.11.2' );
+define( 'TENUP_EXPERIENCE_VERSION', '1.12.0' );
 define( 'TENUP_EXPERIENCE_DIR', __DIR__ );
 define( 'TENUP_EXPERIENCE_FILE', __FILE__ );
 
@@ -73,6 +73,7 @@ function ( $class_name ) {
 API\API::instance();
 Authentication\Usernames::instance();
 Authors\Authors::instance();
+Comments\Comments::instance();
 Gutenberg\Gutenberg::instance();
 Headers\Headers::instance();
 Plugins\Plugins::instance();

README.md

@@ -143,6 +143,52 @@ Filters how many log items to store. Items are stored in array saved to the opti
 
 Define `TENUP_DISABLE_ACTIVITYLOG` as `true` to disable Activity Log.
 
+### Comments
+
+10up Experience includes a feature to disable comments across the site. This feature can be enabled or disabled in `Settings > General`. It is disabled by default.
+
+On top of disabling the comment form, this feature removes the following:
+
+- Comments from the admin menu.
+- Comment blocks from the post editor.
+- Comments from the admin bar.
+
+#### Constants
+
+- `TENUP_DISABLE_COMMENTS`
+
+Define this as `true` to force disable comments or `false` to enable comments from a config file.
+Setting this constant will disable the UI for enabling/disabling comments in the admin.
+
+#### Filters
+
+- `tenup_experience_disable_comments`
+
+Filters whether to disable comments. Default is `false`.
+Defining this filter will disable the UI for enabling/disabling comments in the admin.
+
+- `tenup_experience_disable_comments_disallowed_blocks`
+
+Filters the list of blocks that should be disallowed when comments are disabled. This is useful when core adds new blocks that aren't covered by the default list.
+
+The default list of disallowed blocks is:
+
+- `core/comment-author-name`
+- `core/comment-content`
+- `core/comment-date`
+- `core/comment-edit-link`
+- `core/comment-reply-link`
+- `core/comment-template`
+- `core/comments`
+- `core/comments-pagination`
+- `core/comments-pagination-next`
+- `core/comments-pagination-numbers`
+- `core/comments-pagination-previous`
+- `core/comments-title`
+- `core/post-comments`
+- `core/post-comments-form`
+- `core/latest-comments`
+
 ## Support Level
 
 **Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.

includes/classes/AdminCustomizations/Customizations.php

@@ -84,7 +84,7 @@ public function main_screen() {
 				?>
 				</div>
 
-			<a class="tenup-badge" href="http://10up.com" target="_blank"><span aria-label="<?php esc_attr_e( 'Link to 10up.com', 'tenup' ); ?>">10up.com</span></a>
+			<a class="tenup-badge" href="https://10up.com" target="_blank"><span aria-label="<?php esc_attr_e( 'Link to 10up.com', 'tenup' ); ?>">10up.com</span></a>
 
 			<div class="feature-section one-col">
 				<h2><?php esc_html_e( 'Thanks for working with team 10up!', 'tenup' ); ?></h2>
@@ -191,7 +191,7 @@ public function enqueue_scripts() {
 	 * @return string
 	 */
 	public function filter_admin_footer_text() {
-		$new_text = sprintf( __( 'Thank you for creating with <a href="https://wordpress.org">WordPress</a> and <a href="http://10up.com">10up</a>.', 'tenup' ) );
+		$new_text = sprintf( __( 'Thank you for creating with <a href="https://wordpress.org">WordPress</a> and <a href="https://10up.com">10up</a>.', 'tenup' ) );
 		return $new_text;
 	}
 }