From 944342fb4aa4336fffbe09811dbdb2ec6b155130 Mon Sep 17 00:00:00 2001 From: yhira Date: Fri, 5 Jul 2019 00:57:35 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=83=BB=E3=82=BF=E3=82=B0=E5=85=B1=E9=80=9A=E3=83=95=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=AE=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ad.php | 3 +-- lib/blogcard-in.php | 6 ++---- lib/blogcard-out.php | 3 +-- lib/html5.php | 3 +-- lib/image.php | 6 ++---- lib/links.php | 3 +-- lib/settings.php | 9 +++------ lib/ssl.php | 3 +-- 8 files changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/ad.php b/lib/ad.php index e6c98004f..cdc4e2921 100644 --- a/lib/ad.php +++ b/lib/ad.php @@ -367,8 +367,7 @@ function is_index_middle_ad_visible($count){ //[ad]ショートコードに対して広告を表示する add_filter('the_content', 'replace_ad_shortcode_to_advertisement'); -add_filter('the_category_content', 'replace_ad_shortcode_to_advertisement'); -add_filter('the_tag_content', 'replace_ad_shortcode_to_advertisement'); +add_filter('the_category_tag_content', 'replace_ad_shortcode_to_advertisement'); if ( !function_exists( 'replace_ad_shortcode_to_advertisement' ) ): function replace_ad_shortcode_to_advertisement($the_content){ //[ad]機能が有効な時 diff --git a/lib/blogcard-in.php b/lib/blogcard-in.php index ceaddcec3..af2301049 100644 --- a/lib/blogcard-in.php +++ b/lib/blogcard-in.php @@ -221,8 +221,7 @@ function url_to_internal_blogcard($the_content) { add_filter('widget_text_pc_text', 'url_to_internal_blogcard', 11); add_filter('widget_classic_text', 'url_to_internal_blogcard', 11); add_filter('widget_text_mobile_text', 'url_to_internal_blogcard', 11); - add_filter('the_category_content', 'url_to_internal_blogcard', 11); - add_filter('the_tag_content', 'url_to_internal_blogcard', 11); + add_filter('the_category_tag_content', 'url_to_internal_blogcard', 11); } //本文中のURLショートコードをブログカードタグに変更する @@ -294,8 +293,7 @@ function url_shortcode_to_blogcard($the_content) { add_filter('widget_classic_text', 'url_shortcode_to_blogcard', 9999); add_filter('widget_text_mobile_text', 'url_shortcode_to_blogcard', 9999); add_filter('comment_text', 'url_shortcode_to_blogcard', 9999); -add_filter('the_category_content', 'url_shortcode_to_blogcard', 9999); -add_filter('the_tag_content', 'url_shortcode_to_blogcard', 9999); +add_filter('the_category_tag_content', 'url_shortcode_to_blogcard', 9999); //ブログカード置換用テキストにpタグが含まれているかどうか if ( !function_exists( 'is_p_tag_appropriate' ) ): diff --git a/lib/blogcard-out.php b/lib/blogcard-out.php index 1b2afb526..267e5b4b4 100644 --- a/lib/blogcard-out.php +++ b/lib/blogcard-out.php @@ -63,8 +63,7 @@ function url_to_external_blog_card($the_content) { add_filter('widget_text_pc_text', 'url_to_external_blog_card', 11); add_filter('widget_classic_text', 'url_to_external_blog_card', 11); add_filter('widget_text_mobile_text', 'url_to_external_blog_card', 11); - add_filter('the_category_content', 'url_to_external_blog_card', 11); - add_filter('the_tag_content', 'url_to_external_blog_card', 11); + add_filter('the_category_tag_content', 'url_to_external_blog_card', 11); } diff --git a/lib/html5.php b/lib/html5.php index 01e888829..3079422ba 100644 --- a/lib/html5.php +++ b/lib/html5.php @@ -13,8 +13,7 @@ add_filter('widget_text_pc_text', 'theme_html5_fix'); add_filter('widget_classic_text', 'theme_html5_fix'); add_filter('widget_text_mobile_text', 'theme_html5_fix'); -add_filter('the_category_content', 'theme_html5_fix'); -add_filter('the_tag_content', 'theme_html5_fix'); +add_filter('the_category_tag_content', 'theme_html5_fix'); if ( !function_exists( 'theme_html5_fix' ) ): function theme_html5_fix($the_content){ //に

が追加されてしまう diff --git a/lib/image.php b/lib/image.php index f69a72ce0..cfc372174 100644 --- a/lib/image.php +++ b/lib/image.php @@ -25,8 +25,7 @@ function is_lightbox_plugin_exist($content){ //画像リンクのAタグをLightboxに対応するように付け替え if ( is_lightbox_effect_enable() ) { add_filter( 'the_content', 'add_lightbox_property', 9 ); - add_filter( 'the_category_content', 'add_lightbox_property', 9 ); - add_filter( 'the_tag_content', 'add_lightbox_property', 9 ); + add_filter( 'the_category_tag_content', 'add_lightbox_property', 9 ); } if ( !function_exists( 'add_lightbox_property' ) ): function add_lightbox_property( $content ) { @@ -53,8 +52,7 @@ function add_lightbox_property( $content ) { //http://sorgalla.com/lity/ if ( is_lity_effect_enable() ) { add_filter( 'the_content', 'add_lity_property', 11 ); - add_filter( 'the_category_content', 'add_lity_property', 11 ); - add_filter( 'the_tag_content', 'add_lity_property', 11 ); + add_filter( 'the_category_tag_content', 'add_lity_property', 11 ); } if ( !function_exists( 'add_lity_property' ) ): function add_lity_property( $content ) { diff --git a/lib/links.php b/lib/links.php index fd8c5a8b0..6b86cedbf 100644 --- a/lib/links.php +++ b/lib/links.php @@ -25,8 +25,7 @@ function is_anchor_link_tag_blogcard($anchor_link_tag){ add_filter('widget_text_pc_text', 'replace_anchor_links', 12); add_filter('widget_classic_text', 'replace_anchor_links', 12); add_filter('widget_text_mobile_text', 'replace_anchor_links', 12); -add_filter('the_category_content', 'replace_anchor_links', 12); -add_filter('the_tag_content', 'replace_anchor_links', 12); +add_filter('the_category_tag_content', 'replace_anchor_links', 12); if ( !function_exists( 'replace_anchor_links' ) ): function replace_anchor_links($the_content) { $res = preg_match_all('{]+?>.+?}is', $the_content, $m); diff --git a/lib/settings.php b/lib/settings.php index 9545b0e03..744357c32 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -275,12 +275,9 @@ function add_excerpts_custom_init(){ add_filter('ranking_item_link_tag', 'do_shortcode'); //アピールリア add_filter('appeal_area_message', 'do_shortcode'); -//カテゴリページ -add_filter('the_category_content', 'do_shortcode'); -add_filter('the_category_content', 'shortcode_unautop'); -//タグページ -add_filter('the_tag_content', 'do_shortcode'); -add_filter('the_tag_content', 'shortcode_unautop'); +//カテゴリ・タグページ +add_filter('the_category_tag_content', 'do_shortcode'); +add_filter('the_category_tag_content', 'shortcode_unautop'); //generator を削除 remove_action('wp_head', 'wp_generator'); diff --git a/lib/ssl.php b/lib/ssl.php index c04a19a3d..698fd9b3c 100644 --- a/lib/ssl.php +++ b/lib/ssl.php @@ -113,6 +113,5 @@ function chagne_site_url_html_to_https($the_content){ //add_filter('widget_classic_text', 'chagne_site_url_html_to_https', 1); add_filter('widget_text_mobile_text', 'chagne_site_url_html_to_https', 1); add_filter('comment_text', 'chagne_site_url_html_to_https', 1); - add_filter('the_category_content', 'chagne_site_url_html_to_https', 1); - add_filter('the_tag_content', 'chagne_site_url_html_to_https', 1); + add_filter('the_category_tag_content', 'chagne_site_url_html_to_https', 1); }