opdavies/presentations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update WP and plugins

Browse source
This commit is contained in:
Oliver Davies 2019-04-16 20:56:22 +01:00
parent 10a4713229
commit 1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wp-includes/class-wp-term.php
View file

@ -102,7 +102,6 @@ final class WP_Term {
* Retrieve WP_Term instance.
*
* @since 4.4.0
* @static
*
* @global wpdb $wpdb WordPress database abstraction object.
*
@ -143,11 +142,11 @@ final class WP_Term {
}
}
// If only one match was found, it's the one we want.
// If only one match was found, it's the one we want.
} elseif ( 1 === count( $terms ) ) {
$_term = reset( $terms );
// Otherwise, the term must be shared between taxonomies.
// Otherwise, the term must be shared between taxonomies.
} else {
// If the term is shared only with invalid taxonomies, return the one valid term.
foreach ( $terms as $t ) {
@ -232,8 +231,8 @@ final class WP_Term {
*/
public function __get( $key ) {
switch ( $key ) {
case 'data' :
$data = new stdClass();
case 'data':
$data = new stdClass();
$columns = array( 'term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count' );
foreach ( $columns as $column ) {
$data->{$column} = isset( $this->{$column} ) ? $this->{$column} : null;