Skip to content

Commit 8824fda

Browse files
author
Marco Pereirinha
committed
Merge branch 'develop' into uat
2 parents dcc2727 + cdbd848 commit 8824fda

File tree

10 files changed

+218
-80
lines changed

10 files changed

+218
-80
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"ext-json": "*"
88
},
99
"require-dev": {
10-
"wp-coding-standards/wpcs": "^2.3",
11-
"automattic/vipwpcs": "dev-develop",
1210
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
1311
"phpcompatibility/phpcompatibility-wp": "dev-master",
14-
"phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
12+
"phpcompatibility/php-compatibility": "dev-develop as 9.99.99",
13+
"automattic/vipwpcs": "^3.0",
14+
"wp-coding-standards/wpcs": "^3.0"
1515
},
1616
"config": {
1717
"platform": {

composer.lock

Lines changed: 155 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/assets/class-rest-assets.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ public function get_assets( $id, $search = null, $page = 1 ) {
309309
}
310310
}
311311

312+
$cache = array();
312313
$prepare = $wpdb->prepare(
313314
"SELECT COUNT( id ) as total FROM $wpdb->cld_table WHERE parent_path = %s AND post_state != 'inherit' {$search_ext};", // phpcs:ignore WordPress.DB.PreparedSQL
314315
$cache_point->post_title

0 commit comments

Comments
 (0)