Skip to content

Commit

Permalink
Merge branch 'release/1.11.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Hemberger committed Jan 4, 2021
2 parents a6d9d35 + 3292b24 commit 682c431
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 65 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.11.8 (1/4/21)
* Fixed: Deprecated jQuery load() functions.
* Fixed: Updated WooCommerce template versions.

## 1.11.7 (9/3/20)
* Changed: Added sitemap content type PHP filters.

Expand Down
5 changes: 1 addition & 4 deletions assets/js/admin/customize-controls.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
jQuery(window).load( function($) {

var $ = jQuery;

jQuery( document ).ready( function( $ ) {
/**
* Slider multicheck.
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin/customize-controls.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/settings/metaboxes/sections.php
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ function mai_change_from_sections_template_warning( $object_id, $cmb ) {
$alert = __( 'Warning! Changing to another page template will delete Sections template settings and data. Your content will be moved to the regular editor, but there is no going back!', 'mai-theme-engine' );

printf( "<script>
jQuery(window).load( function() {
$( '#pageparentdiv' ).on( 'change', 'select#page_template', function() {
jQuery(document).ready( function($) {
$('#pageparentdiv').on('change', 'select#page_template', function() {
if ( 'sections.php' !== $(this).val() ) {
alert( '%s' );
}
Expand Down
4 changes: 2 additions & 2 deletions mai-theme-engine.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Plugin URI: https://maitheme.com/
* Description: The Mai Theme Engine plugin
*
* Version: 1.11.7
* Version: 1.11.8
*
* GitHub URI: maithemewp/mai-theme-engine
*
Expand Down Expand Up @@ -89,7 +89,7 @@ public function __wakeup() {
private function setup_constants() {

// Plugin version.
define( 'MAI_THEME_ENGINE_VERSION', '1.11.7' );
define( 'MAI_THEME_ENGINE_VERSION', '1.11.8' );

// DB version.
define( 'MAI_THEME_ENGINE_DB_VERSION', '1600' );
Expand Down
61 changes: 61 additions & 0 deletions templates/woocommerce/content-product-cat.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php
/**
* ***********************
* Changed <li> to <div> *
* ***********************
*
* The template for displaying product category thumbnails within loops
*
* This template can be overridden by copying it to yourtheme/woocommerce/content-product-cat.php.
*
* HOWEVER, on occasion WooCommerce will need to update template files and you
* (the theme developer) will need to copy the new files to your theme to
* maintain compatibility. We try to do this as little as possible, but it does
* happen. When this occurs the version of the template file will be bumped and
* the readme will list any important changes.
*
* @see https://docs.woocommerce.com/document/template-structure/
* @package WooCommerce\Templates
* @version 4.7.0
*/

if ( ! defined( 'ABSPATH' ) ) {
exit;
}
?>
<div <?php wc_product_cat_class( '', $category ); ?>>
<?php
/**
* The woocommerce_before_subcategory hook.
*
* @hooked woocommerce_template_loop_category_link_open - 10
*/
do_action( 'woocommerce_before_subcategory', $category );

/**
* The woocommerce_before_subcategory_title hook.
*
* @hooked woocommerce_subcategory_thumbnail - 10
*/
do_action( 'woocommerce_before_subcategory_title', $category );

/**
* The woocommerce_shop_loop_subcategory_title hook.
*
* @hooked woocommerce_template_loop_category_title - 10
*/
do_action( 'woocommerce_shop_loop_subcategory_title', $category );

/**
* The woocommerce_after_subcategory_title hook.
*/
do_action( 'woocommerce_after_subcategory_title', $category );

/**
* The woocommerce_after_subcategory hook.
*
* @hooked woocommerce_template_loop_category_link_close - 10
*/
do_action( 'woocommerce_after_subcategory', $category );
?>
</div>
54 changes: 0 additions & 54 deletions templates/woocommerce/content-product_cat.php

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/composer/ClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ClassLoader
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
}

return array();
Expand Down
3 changes: 3 additions & 0 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public static function loadClassLoader($class)
}
}

/**
* @return \Composer\Autoload\ClassLoader
*/
public static function getLoader()
{
if (null !== self::$loader) {
Expand Down

0 comments on commit 682c431

Please sign in to comment.