← All changes | src/generators/schema/organization.php +31 -19 19.0 → trunk View file →

		@@ -32,17 +32,34 @@
32	32	else {
33	33	$logo = $this->helpers->schema->image->generate_from_attachment_id( $logo_schema_id, $this->context->company_logo_id, $this->context->company_name );
34	34	}
35	35
36		- return [
37		- '@type' => 'Organization',
38		- '@id' => $this->context->site_url . Schema_IDs::ORGANIZATION_HASH,
39		- 'name' => $this->helpers->schema->html->smart_strip_tags( $this->context->company_name ),
40		- 'url' => $this->context->site_url,
41		- 'sameAs' => \array_values( \array_unique( $this->fetch_social_profiles() ) ),
42		- 'logo' => $logo,
43		- 'image' => [ '@id' => $logo['@id'] ],
	36	+ $organization = [
	37	+ '@type' => 'Organization',
	38	+ '@id' => $this->context->site_url . Schema_IDs::ORGANIZATION_HASH,
	39	+ 'name' => $this->helpers->schema->html->smart_strip_tags( $this->context->company_name ),
44	40	];
	41	+
	42	+ if ( ! empty( $this->context->company_alternate_name ) ) {
	43	+ $organization['alternateName'] = $this->context->company_alternate_name;
	44	+ }
	45	+
	46	+ $organization['url'] = $this->context->site_url;
	47	+ $organization['logo'] = $logo;
	48	+ $organization['image'] = [ '@id' => $logo['@id'] ];
	49	+
	50	+ $same_as = \array_values( \array_unique( \array_filter( $this->fetch_social_profiles() ) ) );
	51	+ if ( ! empty( $same_as ) ) {
	52	+ $organization['sameAs'] = $same_as;
	53	+ }
	54	+
	55	+ if ( \is_array( $this->context->schema_page_type ) && \in_array( 'ProfilePage', $this->context->schema_page_type, true ) ) {
	56	+ $organization['mainEntityOfPage'] = [
	57	+ '@id' => $this->context->main_schema_id,
	58	+ ];
	59	+ }
	60	+
	61	+ return $organization;
45	62	}
46	63
47	64	/**
48	65	* Retrieve the social profiles to display in the organization schema.
		@@ -49,26 +66,21 @@
49	66	*
50	67	* @return array An array of social profiles.
51	68	*/
52	69	private function fetch_social_profiles() {
53		- $social_profiles = $this->helpers->options->get( 'other_social_urls', [] );
54		- $profiles = \array_map( '\urldecode', \array_filter( $social_profiles ) );
	70	+ $profiles = $this->helpers->social_profiles->get_organization_social_profiles();
55	71
56		- $facebook = $this->helpers->options->get( 'facebook_site', '' );
57		- if ( $facebook !== '' ) {
58		- $profiles[] = \urldecode( $facebook );
	72	+ if ( isset( $profiles['other_social_urls'] ) ) {
	73	+ $other_social_urls = $profiles['other_social_urls'];
	74	+ unset( $profiles['other_social_urls'] );
	75	+ $profiles = \array_merge( $profiles, $other_social_urls );
59	76	}
60	77
61		- $twitter = $this->helpers->options->get( 'twitter_site', '' );
62		- if ( $twitter !== '' ) {
63		- $profiles[] = 'https://twitter.com/' . $twitter;
64		- }
65		-
66	78	/**
67	79	* Filter: 'wpseo_schema_organization_social_profiles' - Allows filtering social profiles for the
68	80	* represented organization.
69	81	*
70		- * @api string[] $profiles
	82	+ * @param string[] $profiles
71	83	*/
72	84	$profiles = \apply_filters( 'wpseo_schema_organization_social_profiles', $profiles );
73	85
74	86	return $profiles;