Changeset 143875

Timestamp:

02/28/2021 06:55:45 AM (5 years ago)

Author:

themedropbox

Message:

New version of Lightning - 13.8.9

Location:

lightning/13.8.9

Files:

• . (copied) (copied from lightning/13.8.8)
• plugin-support/woocommerce/functions-woo.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)
• style.css (modified) (1 diff)
• template-parts/breadcrumb.php (modified) (3 diffs)

lightning/13.8.9/plugin-support/woocommerce/functions-woo.php

@@ -70 +70 @@
 }
 
+/**
+ * ショップトップページに指定している固定ページのデザイン設定を取得
+ */
+function lightning_woo_get_design_setting(){
 
+    // Woo Shop Top Page ( 'shop' is settted for Shop Top that it's not slug. )
+    $shop_page_id = wc_get_page_id( 'shop' );
 
-function lightning_woo_get_design_setting(){
-    $shop_page_id = wc_get_page_id( 'shop' );
-    $shop_page    = get_post( $shop_page_id );
+    // 固定ページで指定しているレイアウト情報などを取得
     $option = get_post_meta( $shop_page_id, '_lightning_design_setting', true );
     return $option;
 }
+
+/**
+ * ショップトップのページかどうか？
+ */
 function lightning_woo_is_shop_page(){
     global $post;
@@ -86 +94 @@
 
 /**
- *  カラム表示制御
+ *  ショップトップページのカラム表示制御
  */
 function lightning_woo_is_layout_onecolumn( $return ){
@@ -108 +116 @@
 
 /**
- *  サブサクション表示制御
+ *  ショップトップページのサブサクション表示制御
  */
 function lightning_woo_is_subsection_display( $return ){
@@ -133 +141 @@
 
 /**
- *  ページヘッダーとパンくずの表示制御
+ *  ショップトップページでのページヘッダーの表示制御
  */
-function lightning_woo_is_page_header_and_breadcrumb( $return ){
+function lightning_woo_is_page_header( $return ){
     if ( lightning_woo_is_shop_page() ) {
         $lightning_design_setting = lightning_woo_get_design_setting();
-        if ( ! empty( $lightning_design_setting['hidden_page_header_and_breadcrumb'] ) ) {
+        if ( ! empty( $lightning_design_setting['hidden_page_header'] ) ) {
             $return = false;
         }
@@ -144 +152 @@
     return $return;
 }
-add_filter( 'lightning_is_page_header_and_breadcrumb', 'lightning_woo_is_page_header_and_breadcrumb' );
+add_filter( 'lightning_is_page_header', 'lightning_woo_is_page_header' );
+
+/**
+ *  ショップトップページでのパンくずの表示制御
+ */
+function lightning_woo_is_breadcrumb( $return ){
+    if ( lightning_woo_is_shop_page() ) {
+        $lightning_design_setting = lightning_woo_get_design_setting();
+        if ( ! empty( $lightning_design_setting['hidden_breadcrumb'] ) ) {
+            $return = false;
+        }
+    }
+    return $return;
+}
+add_filter( 'lightning_is_breadcrumb', 'lightning_woo_is_breadcrumb' );
+
 
 /**

lightning/13.8.9/readme.txt

@@ -1 +1 @@
 === Lightning ===
-Lightning WordPress theme, Copyright (C) 2015-2020 Vektor,Inc.
+Lightning WordPress theme, Copyright (C) 2015-2021 Vektor,Inc.
 Lightning WordPress theme is licensed under the GPL.
-Tested up to: 5.6.0
-Stable tag: 13.8.8
+Tested up to: 5.6.2
+Stable tag: 13.8.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -39 +39 @@
 
 == Changelog ==
+
+v13.8.9
+[ Bug fix ][ WooCommerce ] Fix Breadcrumb shop top name
 
 v13.8.8

lightning/13.8.9/style.css

@@ -6 +6 @@
 Author: Vektor,Inc.
 Author URI: https://www.vektor-inc.co.jp
-Version: 13.8.8
+Version: 13.8.9
 Requires at least: 5.3
 Tested up to: 5.6.1

lightning/13.8.9/template-parts/breadcrumb.php

@@ -11 +11 @@
     /*-------------------------------------------*/
     // get_post_type() だとtaxonomyページで該当の投稿がない時に投稿タイプを取得できないため lightning_get_post_type() を使用
-    $post_type        = lightning_get_post_type();
-    $post_type        = $post_type['slug'];
-    $post_type_object = get_post_type_object( $post_type );
+    // また、wooCommerceなどはショップトップの名称が投稿タイプ名と異なるので、そのあたりの処理も lightning_get_post_type() で対応済み
+    $post_type_info   = lightning_get_post_type();
     $show_on_front    = get_option( 'show_on_front' );
     $page_for_post    = get_option( 'page_for_posts' );
@@ -55 +54 @@
     } elseif ( is_single() || is_page() ||is_category() || is_tag() || is_tax() || is_post_type_archive() || is_date() ) {
 
-        if ( 'post' === $post_type && 'page' === $show_on_front && $page_for_post ) { /* including single-post */
+        if ( 'post' === $post_type_info['slug'] && 'page' === $show_on_front && $page_for_post ) { /* including single-post */
             $breadcrumb_html .= '<li' . $microdata_li . '>';
             $breadcrumb_html .= '<a' . $microdata_li_a . ' href="' . esc_url( $post_top_url ) . '">';
@@ -63 +62 @@
         } elseif ( is_post_type_archive() && ! is_date() ) {
             $breadcrumb_html .= '<li>';
-            $breadcrumb_html .= '<span>' . get_the_archive_title() . '</span>';
-            $breadcrumb_html .= '</li>';
-        } elseif ( 'post' !== $post_type && 'page' !== $post_type ) {
+            $breadcrumb_html .= '<span>' . wp_kses_post( $post_type_info['name'] ) . '</span>';
+            $breadcrumb_html .= '</li>';
+        } elseif ( 'post' !== $post_type_info['slug'] && 'page' !== $post_type_info['slug'] ) {
             $breadcrumb_html .= '<li' . $microdata_li . '>';
-            $breadcrumb_html .= '<a' . $microdata_li_a . ' href="' . get_post_type_archive_link( $post_type ) . '">';
-            $breadcrumb_html .= '<span' . $microdata_li_a_span . '>' . $post_type_object->label . '</span>';
+            $breadcrumb_html .= '<a' . $microdata_li_a . ' href="' . get_post_type_archive_link( $post_type_info['slug'] ) . '">';
+            $breadcrumb_html .= '<span' . $microdata_li_a_span . '>' . wp_kses_post( $post_type_info['name'] ) . '</span>';
             $breadcrumb_html .= '</a>';
             $breadcrumb_html .= '</li>';