Merge branch 'release/1.6.3'

maithemewp · Dec 5, 2024 · 5be0cd0 · 5be0cd0
2 parents 4836578 + 5fffa55
commit 5be0cd0
Show file tree

Hide file tree

Showing 53 changed files with 336 additions and 155 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.6.3 (12/5/24)
+* Changed: Updated the updater.
+
 ## 1.6.2 (4/11/24)
 * Changed: Updated the updater.
 * Fixed: Converted to base64 encoded svg in CSS so parsing the DOM doesn't cause issues.

diff --git a/composer.lock b/composer.lock
diff --git a/mai-accordion.php b/mai-accordion.php
@@ -4,7 +4,7 @@
  * Plugin Name:     Mai Accordion
  * Plugin URI:      https://bizbudding.com/mai-design-pack/
  * Description:     Add JS-free accordion toggles for displaying expandable FAQs, transcripts, resources, research, etc.
- * Version:         1.6.2
+ * Version:         1.6.3
  *
  * Author:          BizBudding
  * Author URI:      https://bizbudding.com
@@ -91,7 +91,7 @@ public function __wakeup() {
 	private function setup_constants() {
 		// Plugin version.
 		if ( ! defined( 'MAI_ACCORDION_VERSION' ) ) {
-			define( 'MAI_ACCORDION_VERSION', '1.6.2' );
+			define( 'MAI_ACCORDION_VERSION', '1.6.3' );
 		}
 
 		// Plugin Folder Path.

diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -6,5 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'd05ecc14ff93fd612a81ec7e8ab4c2c9' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p4.php',
+    '256558b1ddf2fa4366ea7d7602798dd1' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p5.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -7,7 +7,7 @@
 class ComposerStaticInit4f45b03a2727805407607318d3b1d87a
 {
     public static $files = array (
-        'd05ecc14ff93fd612a81ec7e8ab4c2c9' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p4.php',
+        '256558b1ddf2fa4366ea7d7602798dd1' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p5.php',
     );
 
     public static $classMap = array (

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2,29 +2,29 @@
     "packages": [
         {
             "name": "yahnis-elsts/plugin-update-checker",
-            "version": "v5.4",
-            "version_normalized": "5.4.0.0",
+            "version": "v5.5",
+            "version_normalized": "5.5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/YahnisElsts/plugin-update-checker.git",
-                "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715"
+                "reference": "845d65da93bcff31649ede00d9d73b1beadbb7f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/e8e53e6d98e37fa7c895c93417f52e3775494715",
-                "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715",
+                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/845d65da93bcff31649ede00d9d73b1beadbb7f0",
+                "reference": "845d65da93bcff31649ede00d9d73b1beadbb7f0",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": ">=5.6.20"
             },
-            "time": "2024-02-24T09:56:49+00:00",
+            "time": "2024-10-16T14:25:00+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "files": [
-                    "load-v5p4.php"
+                    "load-v5p5.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -49,11 +49,11 @@
             ],
             "support": {
                 "issues": "https://github.com/YahnisElsts/plugin-update-checker/issues",
-                "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.4"
+                "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.5"
             },
             "install-path": "../yahnis-elsts/plugin-update-checker"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,26 +3,26 @@
         'name' => '__root__',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '2489429676984570651c1312c22b231846b1fe4b',
+        'reference' => 'bcd66b89247c4edd78511a203914604b9943794d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'dev' => true,
+        'dev' => false,
     ),
     'versions' => array(
         '__root__' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '2489429676984570651c1312c22b231846b1fe4b',
+            'reference' => 'bcd66b89247c4edd78511a203914604b9943794d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'yahnis-elsts/plugin-update-checker' => array(
-            'pretty_version' => 'v5.4',
-            'version' => '5.4.0.0',
-            'reference' => 'e8e53e6d98e37fa7c895c93417f52e3775494715',
+            'pretty_version' => 'v5.5',
+            'version' => '5.5.0.0',
+            'reference' => '845d65da93bcff31649ede00d9d73b1beadbb7f0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../yahnis-elsts/plugin-update-checker',
             'aliases' => array(),

diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php
@@ -4,7 +4,7 @@
 
 if ( !class_exists(PucFactory::class, false) ):
 
-	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p4\PucFactory {
+	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p5\PucFactory {
 	}
 
 endif;
diff --git a/...in-update-checker/Puc/v5p4/Autoloader.php → ...in-update-checker/Puc/v5p5/Autoloader.php b/...in-update-checker/Puc/v5p4/Autoloader.php → ...in-update-checker/Puc/v5p5/Autoloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
 if ( !class_exists(Autoloader::class, false) ):
 

diff --git a/...e-checker/Puc/v5p4/DebugBar/Extension.php → ...e-checker/Puc/v5p5/DebugBar/Extension.php b/...e-checker/Puc/v5p4/DebugBar/Extension.php → ...e-checker/Puc/v5p5/DebugBar/Extension.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\PucFactory;
-use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p5\UpdateChecker;
 
 if ( !class_exists(Extension::class, false) ):
 

diff --git a/...pdate-checker/Puc/v5p4/DebugBar/Panel.php → ...pdate-checker/Puc/v5p5/DebugBar/Panel.php b/...pdate-checker/Puc/v5p4/DebugBar/Panel.php → ...pdate-checker/Puc/v5p5/DebugBar/Panel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\UpdateChecker;
 
 if ( !class_exists(Panel::class, false) && class_exists('Debug_Bar_Panel', false) ):
 
@@ -86,14 +86,22 @@ private function displayStatus() {
 			echo '<h3>Status</h3>';
 			echo '<table class="puc-debug-data">';
 			$state = $this->updateChecker->getUpdateState();
-			$checkNowButton = '';
+			$checkButtonId = $this->updateChecker->getUniqueName('check-now-button');
 			if ( function_exists('get_submit_button')  ) {
 				$checkNowButton = get_submit_button(
 					'Check Now',
 					'secondary',
 					'puc-check-now-button',
 					false,
-					array('id' => $this->updateChecker->getUniqueName('check-now-button'))
+					array('id' => $checkButtonId)
+				);
+			} else {
+				//get_submit_button() is not available in the frontend. Make a button directly.
+				//It won't look the same without admin styles, but it should still work.
+				$checkNowButton = sprintf(
+					'<input type="button" id="%1$s" name="puc-check-now-button" value="%2$s" class="button button-secondary" />',
+					esc_attr($checkButtonId),
+					esc_attr('Check Now')
 				);
 			}
 

diff --git a/...ker/Puc/v5p4/DebugBar/PluginExtension.php → ...ker/Puc/v5p5/DebugBar/PluginExtension.php b/...ker/Puc/v5p4/DebugBar/PluginExtension.php → ...ker/Puc/v5p5/DebugBar/PluginExtension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginExtension::class, false) ):
 

diff --git a/...checker/Puc/v5p4/DebugBar/PluginPanel.php → ...checker/Puc/v5p5/DebugBar/PluginPanel.php b/...checker/Puc/v5p4/DebugBar/PluginPanel.php → ...checker/Puc/v5p5/DebugBar/PluginPanel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginPanel::class, false) ):
 
@@ -17,14 +17,20 @@ protected function displayConfigHeader() {
 		}
 
 		protected function getMetadataButton() {
-			$requestInfoButton = '';
+			$buttonId = $this->updateChecker->getUniqueName('request-info-button');
 			if ( function_exists('get_submit_button') ) {
 				$requestInfoButton = get_submit_button(
 					'Request Info',
 					'secondary',
 					'puc-request-info-button',
 					false,
-					array('id' => $this->updateChecker->getUniqueName('request-info-button'))
+					array('id' => $buttonId)
+				);
+			} else {
+				$requestInfoButton = sprintf(
+					'<input type="button" name="puc-request-info-button" id="%1$s" value="%2$s" class="button button-secondary" />',
+					esc_attr($buttonId),
+					esc_attr('Request Info')
 				);
 			}
 			return $requestInfoButton;

diff --git a/...-checker/Puc/v5p4/DebugBar/ThemePanel.php → ...-checker/Puc/v5p5/DebugBar/ThemePanel.php b/...-checker/Puc/v5p4/DebugBar/ThemePanel.php → ...-checker/Puc/v5p5/DebugBar/ThemePanel.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Theme\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\Theme\UpdateChecker;
 
 if ( !class_exists(ThemePanel::class, false) ):
 

diff --git a/...ate-checker/Puc/v5p4/InstalledPackage.php → ...ate-checker/Puc/v5p5/InstalledPackage.php b/...ate-checker/Puc/v5p4/InstalledPackage.php → ...ate-checker/Puc/v5p5/InstalledPackage.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
 if ( !class_exists(InstalledPackage::class, false) ):
 

diff --git a/...ugin-update-checker/Puc/v5p4/Metadata.php → ...ugin-update-checker/Puc/v5p5/Metadata.php b/...ugin-update-checker/Puc/v5p4/Metadata.php → ...ugin-update-checker/Puc/v5p5/Metadata.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
 use LogicException;
 use stdClass;

diff --git a/...pdate-checker/Puc/v5p4/OAuthSignature.php → ...pdate-checker/Puc/v5p5/OAuthSignature.php b/...pdate-checker/Puc/v5p4/OAuthSignature.php → ...pdate-checker/Puc/v5p5/OAuthSignature.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
 if ( !class_exists(OAuthSignature::class, false) ):
 

diff --git a/...pdate-checker/Puc/v5p4/Plugin/Package.php → ...pdate-checker/Puc/v5p5/Plugin/Package.php b/...pdate-checker/Puc/v5p4/Plugin/Package.php → ...pdate-checker/Puc/v5p5/Plugin/Package.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p4\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p5\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p5\PucFactory;
 
 if ( !class_exists(Package::class, false) ):
 

diff --git a/...te-checker/Puc/v5p4/Plugin/PluginInfo.php → ...te-checker/Puc/v5p5/Plugin/PluginInfo.php b/...te-checker/Puc/v5p4/Plugin/PluginInfo.php → ...te-checker/Puc/v5p5/Plugin/PluginInfo.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Metadata;
+use YahnisElsts\PluginUpdateChecker\v5p5\Metadata;
 
 if ( !class_exists(PluginInfo::class, false) ):
 

diff --git a/...gin-update-checker/Puc/v5p4/Plugin/Ui.php → ...gin-update-checker/Puc/v5p5/Plugin/Ui.php b/...gin-update-checker/Puc/v5p4/Plugin/Ui.php → ...gin-update-checker/Puc/v5p5/Plugin/Ui.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
 
 if ( !class_exists(Ui::class, false) ):
 	/**

diff --git a/...update-checker/Puc/v5p4/Plugin/Update.php → ...update-checker/Puc/v5p5/Plugin/Update.php b/...update-checker/Puc/v5p4/Plugin/Update.php → ...update-checker/Puc/v5p5/Plugin/Update.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Update as BaseUpdate;
+use YahnisElsts\PluginUpdateChecker\v5p5\Update as BaseUpdate;
 
 if ( !class_exists(Update::class, false) ):
 

diff --git a/...checker/Puc/v5p4/Plugin/UpdateChecker.php → ...checker/Puc/v5p5/Plugin/UpdateChecker.php b/...checker/Puc/v5p4/Plugin/UpdateChecker.php → ...checker/Puc/v5p5/Plugin/UpdateChecker.php
@@ -1,10 +1,10 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker as BaseUpdateChecker;
-use YahnisElsts\PluginUpdateChecker\v5p4\Scheduler;
-use YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
+use YahnisElsts\PluginUpdateChecker\v5p5\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p5\UpdateChecker as BaseUpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p5\Scheduler;
+use YahnisElsts\PluginUpdateChecker\v5p5\DebugBar;
 
 if ( !class_exists(UpdateChecker::class, false) ):
 

diff --git a/...in-update-checker/Puc/v5p4/PucFactory.php → ...in-update-checker/Puc/v5p5/PucFactory.php b/...in-update-checker/Puc/v5p4/PucFactory.php → ...in-update-checker/Puc/v5p5/PucFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
-use YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
-use YahnisElsts\PluginUpdateChecker\v5p4\Theme;
-use YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
+use YahnisElsts\PluginUpdateChecker\v5p5\Plugin;
+use YahnisElsts\PluginUpdateChecker\v5p5\Theme;
+use YahnisElsts\PluginUpdateChecker\v5p5\Vcs;
 
 if ( !class_exists(PucFactory::class, false) ):
 
@@ -147,7 +147,7 @@ public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $
 		 *
 		 * Normalize a filesystem path. Introduced in WP 3.9.
 		 * Copying here allows use of the class on earlier versions.
-		 * This version adapted from WP 4.8.2 (unchanged since 4.5.4)
+		 * This version adapted from WP 4.8.2 (unchanged since 4.5.5)
 		 *
 		 * @param string $path Path to normalize.
 		 * @return string Normalized path.

diff --git a/...gin-update-checker/Puc/v5p4/Scheduler.php → ...gin-update-checker/Puc/v5p5/Scheduler.php b/...gin-update-checker/Puc/v5p4/Scheduler.php → ...gin-update-checker/Puc/v5p5/Scheduler.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p4;
+namespace YahnisElsts\PluginUpdateChecker\v5p5;
 
 if ( !class_exists(Scheduler::class, false) ):