Merge branch 'development'

publishpress · Sep 3, 2020 · 1fabd95 · 1fabd95
2 parents 74771f8 + ce42c8a
commit 1fabd95
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 29 deletions.
diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -23,10 +23,13 @@ extensions:
                 src: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/src"
                 vendor: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/vendor"
                 publishpress-authors.php: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/publishpress-authors.php"
+                includes.php: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/includes.php"
+                deprecated.php: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/deprecated.php"
+                defines.php: "%WP_ROOT_FOLDER%/wp-content/plugins/publishpress-authors/defines.php"
 
 params:
     - .env.testing
 settings:
     shuffle: true
     lint: true
-    report_useless_tests: true
+    report_useless_tests: true
diff --git a/composer.lock b/composer.lock
diff --git a/defines.php b/defines.php
@@ -12,7 +12,7 @@
 defined('ABSPATH') or die('No direct script access allowed.');
 
 if (!defined('PP_AUTHORS_VERSION')) {
-    define('PP_AUTHORS_VERSION', '3.6.0');
+    define('PP_AUTHORS_VERSION', '3.6.1');
     define('PP_AUTHORS_FILE', 'publishpress-authors/publishpress-authors.php');
     define('PP_AUTHORS_BASE_PATH', plugin_dir_path(__DIR__ . '/publishpress-authors.php'));
     define('PP_AUTHORS_MODULES_PATH', PP_AUTHORS_BASE_PATH . 'src/modules/');

diff --git a/publishpress-authors.php b/publishpress-authors.php
@@ -5,7 +5,7 @@
  * Description: PublishPress Authors allows you to add multiple authors and guest authors to WordPress posts
  * Author:      PublishPress
  * Author URI:  https://publishpress.com
- * Version: 3.6.0
+ * Version: 3.6.1
  * Text Domain: publishpress-authors
  *
  * ------------------------------------------------------------------------------

diff --git a/readme.txt b/readme.txt
@@ -127,6 +127,10 @@ There are two ways to install the PublishPress Authors plugin:
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+= [3.6.1] - 2020-09-03 =
+
+* Fixed: Fix admin notice for Co-Authors Plus displaying even when the plugin is not installed;
+
 = [3.6.0] - 2020-09-02 =
 
 * Added: Added support to update authors for posts using the quick edit form, #180;

diff --git a/src/modules/multiple-authors/multiple-authors.php b/src/modules/multiple-authors/multiple-authors.php
@@ -1926,6 +1926,10 @@ public function coauthorsMigrationNotice()
         {
             global $pagenow;
 
+            if (!isset($GLOBALS['coauthors_plus']) || empty($GLOBALS['coauthors_plus'])) {
+                return;
+            }
+
             $requirements = [
                 (isset($_GET['page']) && $_GET['page'] === 'ppma-modules-settings') ? 1 : 0,
                 ($pagenow === 'edit-tags.php' && isset($_GET['taxonomy']) && $_GET['taxonomy'] === 'author') ? 1 : 0