Skip to content

Commit 6be3286

Browse files
committed
Update from vk-blocks-pro
1 parent fb17aae commit 6be3286

File tree

52 files changed

+1416
-1374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1416
-1374
lines changed

README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ VK Blocks の現在のデプロイフローは以下の通り
184184

185185
* PHPUnit テスト
186186

187-
### vk-blocks-pro/develop にマージ
188-
189-
#### deploy-develop.yml
187+
### vk-blocks-pro/develop にプッシュ&マージ
188+
#### develop-test.yml
190189

190+
* PHPUnit テスト
191191
* 確認用サーバーにデプロイ
192192

193193
### テストサーバーで目視確認
@@ -221,10 +221,6 @@ VK Blocks の現在のデプロイフローは以下の通り
221221
`git tag -d pre_*.*.*.*` でタグ削除
222222
`git push origin :pre_*.*.*.*` でリモートタグ削除
223223

224-
#### php-unit-test.yml
225-
226-
* PHPUnit テスト
227-
228224
#### release-github-and-deploy-test-sv.yml
229225

230226
* build -> composer install -> dist
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-rich-text', 'wp-server-side-render'), 'version' => 'b0f3ac651d118b1a6eee647afac0cedd');
1+
<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-rich-text', 'wp-server-side-render'), 'version' => '23df50dcce75979ba90158bcc95fda30');

inc/vk-blocks/build/block-build.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inc/vk-blocks/view/class-vk-blocks-postlist.php

+14-4
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,20 @@ public static function get_loop_query_child( $attributes ) {
218218
* @return string
219219
*/
220220
public static function get_render_no_post( $wp_query = null ) {
221-
if ( ! empty( $wp_query->query['post_type'][0] ) ) {
222-
$post_type_object = get_post_type_object( $wp_query->query['post_type'][0] );
223-
$name = $post_type_object->label;
224-
} else {
221+
$name = '';
222+
if ( ! empty( $wp_query->query['post_type'] ) ) {
223+
if ( is_array( $wp_query->query['post_type'] ) ) {
224+
$post_type = $wp_query->query['post_type'][0];
225+
} else {
226+
$post_type = $wp_query->query['post_type'];
227+
}
228+
$post_type_object = get_post_type_object( $post_type );
229+
if ( ! empty( $post_type_object->label ) ) {
230+
$name = $post_type_object->label;
231+
}
232+
}
233+
234+
if ( ! $name ) {
225235
$name = __( 'Post', 'vk-blocks' );
226236
}
227237

0 commit comments

Comments
 (0)