Merge branch 'develop' into fix/sync-patterns-error-2

10up · Jul 14, 2024 · fb3028b · fb3028b
2 parents 9620a3e + 5774e61
commit fb3028b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/release-pull-request.yml b/.github/workflows/release-pull-request.yml
@@ -14,7 +14,7 @@ jobs:
           BRANCH=${GITHUB_REF##*/}
           echo $BRANCH
           VERSION=${BRANCH#'release/'}
-          echo ::set-output name=result::"Release: ${VERSION}"
+          echo "result="Release: ${VERSION}"" >> $GITHUB_OUTPUT
         id: title
       - name: Create Pull Request
         run: gh pr create --draft --title "${{ steps.title.outputs.result }}" --body-file ./.github/release-pull-request-template.md

diff --git a/includes/settings.php b/includes/settings.php
@@ -125,7 +125,11 @@ function update_notice( $plugin_file, $plugin_data, $status ) {
  * @since 1.2
  */
 function maybe_notice() {
-	if ( 0 === strpos( get_current_screen()->parent_base, 'distributor' ) ) {
+	$parent_base = get_current_screen()->parent_base;
+	if ( ! $parent_base ) {
+		return;
+	}
+	if ( 0 === strpos( $parent_base, 'distributor' ) ) {
 		if ( Utils\is_development_version() ) {
 			?>
 			<div class="notice notice-warning">

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 === Distributor ===
 Contributors:      10up
 Tags:              content, distribution, syndication, management
-Tested up to:      6.5
+Tested up to:      6.6
 Stable tag:        2.0.4
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html