Merge branch 'release/1.11.6'

maithemewp · Aug 21, 2020 · 72d78f1 · 72d78f1
2 parents f9b854a + c5b8f83
commit 72d78f1
Show file tree

Hide file tree

Showing 79 changed files with 1,169 additions and 274 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.11.6 (8/21/20)
+* Fixed: Compatibility with WP 5.5, deprecated `wp_make_content_images_responsive()` in favor of `wp_filter_content_tags()` when available.
+* Changed: Update updater.
+
 ## 1.11.5 (2/12/20)
 * Fixed: Gallery alignment again again.
 

diff --git a/composer.lock b/composer.lock
diff --git a/lib/classes/class-grid.php b/lib/classes/class-grid.php
@@ -1614,7 +1614,7 @@ function get_processed_content( $content ) {
 		$content = convert_smilies( $content );
 		$content = wpautop( $content );
 		$content = shortcode_unautop( $content );
-		$content = wp_make_content_images_responsive( $content );
+		$content = function_exists( 'wp_filter_content_tags' ) ? wp_filter_content_tags( $content ) : wp_make_content_images_responsive( $content ); // WP runs priority 10. WP 5.5 with fallback.
 		return $content;
 	}
 

diff --git a/lib/classes/class-section.php b/lib/classes/class-section.php
@@ -471,7 +471,9 @@ function get_section_content() {
 		$html = '';
 		$html .= $this->get_section_title();
 		if ( $this->full_width_image ) {
-			$html .= wp_kses_post( wp_make_content_images_responsive( trim( $this->content ) ) );
+			$content = trim( $this->content );
+			$content = function_exists( 'wp_filter_content_tags' ) ? wp_filter_content_tags( $content ) : wp_make_content_images_responsive( $content ); // WP runs priority 10. WP 5.5 with fallback.
+			$html   .= wp_kses_post( $content );
 		} else {
 			$html .= mai_get_processed_content( $this->content );
 		}

diff --git a/lib/functions/display.php b/lib/functions/display.php
@@ -19,7 +19,7 @@ function mai_get_processed_content( $content ) {
 	$content = wpautop( $content );                           // WP runs priority 10.
 	$content = mai_content_filter_shortcodes( $content );     // after wpautop, before shortcodes are parsed.
 	$content = shortcode_unautop( $content );                 // WP runs priority 10.
-	$content = wp_make_content_images_responsive( $content ); // WP runs priority 10.
+	$content = function_exists( 'wp_filter_content_tags' ) ? wp_filter_content_tags( $content ) : wp_make_content_images_responsive( $content ); // WP runs priority 10. WP 5.5 with fallback.
 	$content = do_shortcode( $content );                      // WP runs priority 11.
 	$content = convert_smilies( $content );                   // WP runs priority 20.
 	return $content;

diff --git a/lib/structure/banner.php b/lib/structure/banner.php
@@ -159,6 +159,7 @@ function mai_do_banner_content() {
 
 	// Term archives.
 	elseif ( is_category() || is_tag() || is_tax() ) {
+		// This is from genesis_do_taxonomy_title_description().
 		$term = is_tax() ? get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ) : $wp_query->get_queried_object();
 		if ( $term ) {
 			$title = get_term_meta( $term->term_id, 'headline', true );

diff --git a/mai-theme-engine.php b/mai-theme-engine.php
@@ -5,7 +5,7 @@
  * Plugin URI:      https://maitheme.com/
  * Description:     The Mai Theme Engine plugin
  *
- * Version:         1.11.5
+ * Version:         1.11.6
  *
  * GitHub URI:      maithemewp/mai-theme-engine
  *
@@ -89,7 +89,7 @@ public function __wakeup() {
 	private function setup_constants() {
 
 		// Plugin version.
-		define( 'MAI_THEME_ENGINE_VERSION', '1.11.5' );
+		define( 'MAI_THEME_ENGINE_VERSION', '1.11.6' );
 
 		// DB version.
 		define( 'MAI_THEME_ENGINE_DB_VERSION', '1600' );

diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -6,6 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    '241d2b5b9c1e680c0770b006b0271156' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v4p9.php',
+    '689b08b7620712b04324ecd7ed167c6b' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v4p10.php',
     'eb0e248b25b656ba76af120dff1e9323' => $vendorDir . '/cmb2/cmb2/init.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -7,7 +7,7 @@
 class ComposerStaticInit29cbfa4c66a87652b0a20a26f9238cc1
 {
     public static $files = array (
-        '241d2b5b9c1e680c0770b006b0271156' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v4p9.php',
+        '689b08b7620712b04324ecd7ed167c6b' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v4p10.php',
         'eb0e248b25b656ba76af120dff1e9323' => __DIR__ . '/..' . '/cmb2/cmb2/init.php',
     );
 

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -56,29 +56,29 @@
     },
     {
         "name": "yahnis-elsts/plugin-update-checker",
-        "version": "v4.9",
-        "version_normalized": "4.9.0.0",
+        "version": "v4.10",
+        "version_normalized": "4.10.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/YahnisElsts/plugin-update-checker.git",
-            "reference": "28f29c940cc22754aff85a99645e3c0a51c097e8"
+            "reference": "0edd15f67822464af8a23285ce367b30d515a855"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/28f29c940cc22754aff85a99645e3c0a51c097e8",
-            "reference": "28f29c940cc22754aff85a99645e3c0a51c097e8",
+            "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/0edd15f67822464af8a23285ce367b30d515a855",
+            "reference": "0edd15f67822464af8a23285ce367b30d515a855",
             "shasum": ""
         },
         "require": {
             "ext-json": "*",
             "php": ">=5.2.0"
         },
-        "time": "2020-02-07T11:07:19+00:00",
+        "time": "2020-08-21T11:36:45+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
             "files": [
-                "load-v4p9.php"
+                "load-v4p10.php"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",

diff --git a/vendor/yahnis-elsts/plugin-update-checker/.gitignore b/vendor/yahnis-elsts/plugin-update-checker/.gitignore
@@ -0,0 +1,40 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# The entire IDEA/PhpStorm directory
+.idea/
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4/Factory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v4/Factory.php
@@ -1,6 +1,6 @@
 <?php
 if ( !class_exists('Puc_v4_Factory', false) ):
 
-	class Puc_v4_Factory extends Puc_v4p9_Factory { }
+	class Puc_v4_Factory extends Puc_v4p10_Factory { }
 
 endif;
diff --git a/...in-update-checker/Puc/v4p9/Autoloader.php → ...n-update-checker/Puc/v4p10/Autoloader.php b/...in-update-checker/Puc/v4p9/Autoloader.php → ...n-update-checker/Puc/v4p10/Autoloader.php
@@ -1,8 +1,8 @@
 <?php
 
-if ( !class_exists('Puc_v4p9_Autoloader', false) ):
+if ( !class_exists('Puc_v4p10_Autoloader', false) ):
 
-	class Puc_v4p9_Autoloader {
+	class Puc_v4p10_Autoloader {
 		private $prefix = '';
 		private $rootDir = '';
 		private $libraryDir = '';
@@ -14,7 +14,12 @@ public function __construct() {
 			$nameParts = explode('_', __CLASS__, 3);
 			$this->prefix = $nameParts[0] . '_' . $nameParts[1] . '_';
 
-			$this->libraryDir = realpath($this->rootDir . '../..') . '/';
+			$this->libraryDir = $this->rootDir . '../..';
+			if ( !self::isPhar() ) {
+				$this->libraryDir = realpath($this->libraryDir);
+			}
+			$this->libraryDir = $this->libraryDir . '/';
+
 			$this->staticMap = array(
 				'PucReadmeParser' => 'vendor/PucReadmeParser.php',
 				'Parsedown' => 'vendor/Parsedown.php',
@@ -24,6 +29,17 @@ public function __construct() {
 			spl_autoload_register(array($this, 'autoload'));
 		}
 
+		/**
+		 * Determine if this file is running as part of a Phar archive.
+		 *
+		 * @return bool
+		 */
+		private static function isPhar() {
+			//Check if the current file path starts with "phar://".
+			static $pharProtocol = 'phar://';
+			return (substr(__FILE__, 0, strlen($pharProtocol)) === $pharProtocol);
+		}
+
 		public function autoload($className) {
 			if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
 				/** @noinspection PhpIncludeInspection */

diff --git a/...e-checker/Puc/v4p9/DebugBar/Extension.php → ...-checker/Puc/v4p10/DebugBar/Extension.php b/...e-checker/Puc/v4p9/DebugBar/Extension.php → ...-checker/Puc/v4p10/DebugBar/Extension.php
@@ -1,12 +1,12 @@
 <?php
-if ( !class_exists('Puc_v4p9_DebugBar_Extension', false) ):
+if ( !class_exists('Puc_v4p10_DebugBar_Extension', false) ):
 
-	class Puc_v4p9_DebugBar_Extension {
+	class Puc_v4p10_DebugBar_Extension {
 		const RESPONSE_BODY_LENGTH_LIMIT = 4000;
 
-		/** @var Puc_v4p9_UpdateChecker */
+		/** @var Puc_v4p10_UpdateChecker */
 		protected $updateChecker;
-		protected $panelClass = 'Puc_v4p9_DebugBar_Panel';
+		protected $panelClass = 'Puc_v4p10_DebugBar_Panel';
 
 		public function __construct($updateChecker, $panelClass = null) {
 			$this->updateChecker = $updateChecker;
@@ -142,6 +142,15 @@ protected function preAjaxRequest() {
 			@ini_set('display_errors', 'On');
 		}
 
+		/**
+		 * Remove hooks that were added by this extension.
+		 */
+		public function removeHooks() {
+			remove_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
+			remove_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
+			remove_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
+		}
+
 		/**
 		 * @param string $filePath
 		 * @return string
@@ -150,11 +159,11 @@ private function getLibraryUrl($filePath) {
 			$absolutePath = realpath(dirname(__FILE__) . '/../../../' . ltrim($filePath, '/'));
 
 			//Where is the library located inside the WordPress directory structure?
-			$absolutePath = Puc_v4p9_Factory::normalizePath($absolutePath);
+			$absolutePath = Puc_v4p10_Factory::normalizePath($absolutePath);
 
-			$pluginDir = Puc_v4p9_Factory::normalizePath(WP_PLUGIN_DIR);
-			$muPluginDir = Puc_v4p9_Factory::normalizePath(WPMU_PLUGIN_DIR);
-			$themeDir = Puc_v4p9_Factory::normalizePath(get_theme_root());
+			$pluginDir = Puc_v4p10_Factory::normalizePath(WP_PLUGIN_DIR);
+			$muPluginDir = Puc_v4p10_Factory::normalizePath(WPMU_PLUGIN_DIR);
+			$themeDir = Puc_v4p10_Factory::normalizePath(get_theme_root());
 
 			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
 				//It's part of a plugin.

diff --git a/...pdate-checker/Puc/v4p9/DebugBar/Panel.php → ...date-checker/Puc/v4p10/DebugBar/Panel.php b/...pdate-checker/Puc/v4p9/DebugBar/Panel.php → ...date-checker/Puc/v4p10/DebugBar/Panel.php
@@ -1,9 +1,9 @@
 <?php
 
-if ( !class_exists('Puc_v4p9_DebugBar_Panel', false) && class_exists('Debug_Bar_Panel', false) ):
+if ( !class_exists('Puc_v4p10_DebugBar_Panel', false) && class_exists('Debug_Bar_Panel', false) ):
 
-	class Puc_v4p9_DebugBar_Panel extends Debug_Bar_Panel {
-		/** @var Puc_v4p9_UpdateChecker */
+	class Puc_v4p10_DebugBar_Panel extends Debug_Bar_Panel {
+		/** @var Puc_v4p10_UpdateChecker */
 		protected $updateChecker;
 
 		private $responseBox = '<div class="puc-ajax-response" style="display: none;"></div>';

diff --git a/...ker/Puc/v4p9/DebugBar/PluginExtension.php → ...er/Puc/v4p10/DebugBar/PluginExtension.php b/...ker/Puc/v4p9/DebugBar/PluginExtension.php → ...er/Puc/v4p10/DebugBar/PluginExtension.php
@@ -1,12 +1,12 @@
 <?php
-if ( !class_exists('Puc_v4p9_DebugBar_PluginExtension', false) ):
+if ( !class_exists('Puc_v4p10_DebugBar_PluginExtension', false) ):
 
-	class Puc_v4p9_DebugBar_PluginExtension extends Puc_v4p9_DebugBar_Extension {
-		/** @var Puc_v4p9_Plugin_UpdateChecker */
+	class Puc_v4p10_DebugBar_PluginExtension extends Puc_v4p10_DebugBar_Extension {
+		/** @var Puc_v4p10_Plugin_UpdateChecker */
 		protected $updateChecker;
 
 		public function __construct($updateChecker) {
-			parent::__construct($updateChecker, 'Puc_v4p9_DebugBar_PluginPanel');
+			parent::__construct($updateChecker, 'Puc_v4p10_DebugBar_PluginPanel');
 
 			add_action('wp_ajax_puc_v4_debug_request_info', array($this, 'ajaxRequestInfo'));
 		}

diff --git a/...checker/Puc/v4p9/DebugBar/PluginPanel.php → ...hecker/Puc/v4p10/DebugBar/PluginPanel.php b/...checker/Puc/v4p9/DebugBar/PluginPanel.php → ...hecker/Puc/v4p10/DebugBar/PluginPanel.php
@@ -1,10 +1,10 @@
 <?php
 
-if ( !class_exists('Puc_v4p9_DebugBar_PluginPanel', false) ):
+if ( !class_exists('Puc_v4p10_DebugBar_PluginPanel', false) ):
 
-	class Puc_v4p9_DebugBar_PluginPanel extends Puc_v4p9_DebugBar_Panel {
+	class Puc_v4p10_DebugBar_PluginPanel extends Puc_v4p10_DebugBar_Panel {
 		/**
-		 * @var Puc_v4p9_Plugin_UpdateChecker
+		 * @var Puc_v4p10_Plugin_UpdateChecker
 		 */
 		protected $updateChecker;
 

diff --git a/...-checker/Puc/v4p9/DebugBar/ThemePanel.php → ...checker/Puc/v4p10/DebugBar/ThemePanel.php b/...-checker/Puc/v4p9/DebugBar/ThemePanel.php → ...checker/Puc/v4p10/DebugBar/ThemePanel.php
@@ -1,10 +1,10 @@
 <?php
 
-if ( !class_exists('Puc_v4p9_DebugBar_ThemePanel', false) ):
+if ( !class_exists('Puc_v4p10_DebugBar_ThemePanel', false) ):
 
-	class Puc_v4p9_DebugBar_ThemePanel extends Puc_v4p9_DebugBar_Panel {
+	class Puc_v4p10_DebugBar_ThemePanel extends Puc_v4p10_DebugBar_Panel {
 		/**
-		 * @var Puc_v4p9_Theme_UpdateChecker
+		 * @var Puc_v4p10_Theme_UpdateChecker
 		 */
 		protected $updateChecker;