Release v3.3.1 (#838)

* Release v3.3.0 (#821) (#822) * Hotfix 784 ics timezone (#785) * Add timezone data into the .ics file for identified tz * Fix timezone string for tz based on offsets * Update version number * Update the changelog * Multisite: Role selection is ignored by Add User (#789) * Add file to be ignored for the builder * Fix admin menu icon, #802 * Update the changelog * Update tested WP version to 5.7 * Fix notice about array converted to string, #813 * Fix accordion on metaboxes in WP 5.7, #816 * Fix 3rd argument passed to a filter, #814 (#817) * Fix 3rd argument passed to a filter, #814 * Update the changelog * Removed not used variable * Fix support for PHP 5.6 fixing the version of psr/container * Fix accordion on WP 5.7, #814 * Bump version to 3.2.1-beta.2 * Add filters to customize the available fields in the shortcode help (#818) * Add filters to customize the available fields in the shortcode help * Update the changelog * Update the changelog * Fix the email channel for authors identified by the email, #793 (#819) * Fix the email channel for authors identified by the email, #793 Fix needed for allowing guest authors with email address to be notified. * Update changelog * Update changelog * Bump version number to 3.3.0-rc.1 * Show the Upgrade to Pro only for who can install plugins, #599 * Update version v3.3.0 * Preparing to release Co-authored-by: Kevin Behrens <[email protected]> Co-authored-by: Kevin Behrens <[email protected]> * Add wp-ajax-response as dependency of editorial comments, #827 * Check capability before displaying Active Notifications * Update the changelog * Fix a typo in a comment * Fix php warning about undefined index "untrashed", #831 * Update the changelog * Update version number * Update the changelog * Update version number to 3.3.1 * Update the release date in the changelog Co-authored-by: Kevin Behrens <[email protected]>
publishpress · Apr 15, 2021 · d398ad6 · d398ad6
1 parent f90c0e1
commit d398ad6
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 38 deletions.
diff --git a/includes.php b/includes.php
@@ -33,7 +33,7 @@
 
 if (!defined('PP_LOADED')) {
     // Define constants
-    define('PUBLISHPRESS_VERSION', '3.3.0');
+    define('PUBLISHPRESS_VERSION', '3.3.1');
     define('PUBLISHPRESS_BASE_PATH', __DIR__);
     define('PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_BASE_PATH . '/publishpress.php');
     define('PUBLISHPRESS_LIBRARIES_PATH', PUBLISHPRESS_BASE_PATH . '/libraries');

diff --git a/libraries/Notifications/Workflow/Step/Event/Base.php b/libraries/Notifications/Workflow/Step/Event/Base.php
@@ -39,7 +39,7 @@ public function __construct()
             [$this, 'filter_workflow_metabox_context']
         );
 
-        // Add the fitler to the run workflow query args
+        // Add the filter to the run workflow query args
         add_filter(
             'publishpress_notifications_running_workflow_meta_query',
             [$this, 'filter_running_workflow_query_args'],

diff --git a/modules/calendar/calendar.php b/modules/calendar/calendar.php
@@ -1215,15 +1215,15 @@ class="button-primary">
                         unset($_GET['trashed']);
                     }
 
-                    $untrashed = (int)$_GET['untrashed'];
-                    if (isset($_GET['untrashed']) && $untrashed) {
+
+                    if (isset($_GET['untrashed']) && (int)$_GET['untrashed']) {
                         printf(
                             _n(
                                 'Post restored from the Trash.',
                                 '%d posts restored from the Trash.',
-                                $untrashed
+                                (int)$_GET['untrashed']
                             ),
-                            number_format_i18n($untrashed)
+                            number_format_i18n((int)$_GET['untrashed'])
                         );
                         unset($_GET['undeleted']);
                     }

diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
@@ -137,7 +137,7 @@ public function add_admin_scripts()
             wp_enqueue_script(
                 'publishpress-editorial-comments',
                 $this->module_url . 'lib/editorial-comments.js',
-                ['jquery'],
+                ['jquery', 'wp-ajax-response'],
                 PUBLISHPRESS_VERSION,
                 true
             );

diff --git a/modules/notifications/notifications.php b/modules/notifications/notifications.php
@@ -549,35 +549,38 @@ public function notifications_meta_box()
                 <?php endif; ?>
                 <hr>
 
-                <div class="pp_post_notify_workflows">
-                    <?php if (!empty($activeWorkflows)) : ?>
-                        <h3><?php echo esc_html__('Active Notifications', 'publishpress'); ?></h3>
-
-                        <ul>
-                            <?php foreach ($activeWorkflows as $workflow) : ?>
-                                <li>
-                                    <a href="<?php echo esc_url(admin_url(
-                                        'post.php?post=' . $workflow->workflow_post->ID . '&action=edit&classic-editor'
-                                    )); ?>"
-                                       target="_blank">
-                                        <?php echo esc_html($workflow->workflow_post->post_title); ?><?php if (in_array(
-                                            $workflow->workflow_post->ID,
-                                            $followersWorkflows
-                                        )): ?>&sup1;<?php endif; ?>
-                                    </a>
-                                </li>
-                            <?php endforeach; ?>
-                        </ul>
-                    <?php else: ?>
-                        <p class="no-workflows"><?php echo sprintf(
-                                esc_html__(
-                                    'No active notifications found for this %s.',
-                                    'publishpress'
-                                ),
-                                esc_html($postType->labels->singular_name)
-                            ); ?></p>
-                    <?php endif; ?>
-                </div>
+                <?php
+                if (current_user_can('edit_pp_notif_workflows')) : ?>
+                    <div class="pp_post_notify_workflows">
+                        <?php if (!empty($activeWorkflows)) : ?>
+                            <h3><?php echo esc_html__('Active Notifications', 'publishpress'); ?></h3>
+
+                            <ul>
+                                <?php foreach ($activeWorkflows as $workflow) : ?>
+                                    <li>
+                                        <a href="<?php echo esc_url(admin_url(
+                                            'post.php?post=' . $workflow->workflow_post->ID . '&action=edit&classic-editor'
+                                        )); ?>"
+                                           target="_blank">
+                                            <?php echo esc_html($workflow->workflow_post->post_title); ?><?php if (in_array(
+                                                $workflow->workflow_post->ID,
+                                                $followersWorkflows
+                                            )): ?>&sup1;<?php endif; ?>
+                                        </a>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        <?php else: ?>
+                            <p class="no-workflows"><?php echo sprintf(
+                                    esc_html__(
+                                        'No active notifications found for this %s.',
+                                        'publishpress'
+                                    ),
+                                    esc_html($postType->labels->singular_name)
+                                ); ?></p>
+                        <?php endif; ?>
+                    </div>
+                <?php endif; ?>
 
                 <?php
                 /**

diff --git a/publishpress.php b/publishpress.php
@@ -5,7 +5,7 @@
  * Description: PublishPress helps you plan and publish content with WordPress. Features include a content calendar, notifications, and custom statuses.
  * Author: PublishPress
  * Author URI: https://publishpress.com
- * Version: 3.3.0
+ * Version: 3.3.1
  * Text Domain: publishpress
  * Domain Path: /languages
  *

diff --git a/readme.txt b/readme.txt
@@ -6,7 +6,7 @@ Tags: editorial calendar, notifications, custom statuses, editorial comments, wo
 Requires at least: 4.6
 Requires PHP: 5.6
 Tested up to: 5.7
-Stable tag: 3.3.0
+Stable tag: 3.3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -120,6 +120,12 @@ Follow PublishPress on [Facebook](https://www.facebook.com/publishpress), [Twitt
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+= [3.3.1] - 2021-04-15 =
+
+* Fixed: Fix the editorial comments for non-admins, #827;
+* Fixed: Check capability "edit_pp_notif_workflows" before displaying the "Active Notifications" list in the post edit page, not displaying it for those who can't edit notifications;
+* Fixed: Fix PHP warning about undefined index "untrashed" after trashing a scheduled post, #831;
+
 = [3.3.0] - 2021-03-18 =
 
 * Added: Add filters to customize the available fields in the notifications "shortcode" help text: publishpress_notifications_shortcode_post_fields, publishpress_notifications_shortcode_actor_fields, publishpress_notifications_shortcode_workflow_fields, publishpress_notifications_shortcode_edcomments_fields, publishpress_notifications_shortcode_receiver_fields;