Fix bug when multisite loaded as the only plugin. Add auto release workflow.

Author: corsacca

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test
+
+    # Below borrowed from https://github.com/actions/upload-release-asset
+    - name: Build project
+      run: |
+        mkdir disciple-tools-multisite-master |
+        cp -r disciple-tools-multisite.php LICENSE SECURITY.md includes languages spinner.svg disciple-tools-multisite-master/ |
+        zip -r disciple-tools-multisite.zip disciple-tools-multisite-master
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release v${{ github.ref }}
+        draft: false
+        prerelease: false
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+        asset_path: ./disciple-tools-multisite.zip
+        asset_name: disciple-tools-multisite.zip
+        asset_content_type: application/zip

disciple-tools-multisite.php

@@ -3,7 +3,7 @@
  * Plugin Name: Disciple Tools - Multisite
  * Plugin URI: https://github.com/DiscipleTools/disciple-tools-multisite
  * Description: Disciple Tools Multisite plugin adds network administration utilities to the multisite network admin area, helpful for managing Disciple Tools multisite installs.
- * Version:  1.6
+ * Version:  1.6.1
  * Author URI: https://github.com/DiscipleTools
  * GitHub Plugin URI: https://github.com/DiscipleTools/disciple-tools-multisite
  * Requires at least: 4.7.0
@@ -213,14 +213,14 @@ public function __call( $method = '', $args = array() ) {
 /**
  * Make the update checker available on multisites when the default theme is not Disciple.Tools
  */
-if ( is_multisite() && is_network_admin() ){
+if ( is_multisite() && ( is_network_admin() || wp_doing_cron() ) ){
     if ( !class_exists( 'Puc_v4_Factory' ) ){
         require( "includes/admin/plugin-update-checker/plugin-update-checker.php" );
     }
 }
 
 add_action( 'plugins_loaded', function (){
-    if ( is_multisite() && ( is_admin() || wp_doing_cron() ) ){
+    if ( is_multisite() && ( is_network_admin() || wp_doing_cron() ) ){
         // find the Disciple.Tools theme and load the plugin update checker.
         foreach ( wp_get_themes() as $theme ){
             if ( $theme->get( 'TextDomain' ) === "disciple_tools" && file_exists( $theme->get_stylesheet_directory() . '/dt-core/libraries/plugin-update-checker/plugin-update-checker.php' ) ){

version-control.json

@@ -1,6 +1,6 @@
 {
   "name": "Disciple Tools - Multisite",
-  "version": "1.6",
+  "version": "1.6.1",
   "last_updated": "2021-01",
   "author": "Disciple Tools",
   "author_homepage": "https://disciple.tools",