Skip to content

Commit 39bf2b2

Browse files
remcotolsmaremcotolsma
committed
Merge branch 'release/1.3.1'
2 parents e181bc9 + 4b30b3a commit 39bf2b2

File tree

7 files changed

+55
-19
lines changed

7 files changed

+55
-19
lines changed

‎classes/class-plugin.php‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public function __construct( $file ) {
6969
// WPML
7070
add_filter( 'icl_set_current_language', array( $this, 'icl_set_current_language' ) );
7171

72+
// WordPress SEO
73+
add_filter( 'wpseo_sitemap_exclude_post_type', array( $this, 'wpseo_sitemap_exclude_post_type' ), 10, 2 );
74+
7275
// Admin
7376
if ( is_admin() ) {
7477
new Pronamic_Domain_Mapping_Plugin_Admin( $this );
@@ -132,7 +135,7 @@ public function send_headers() {
132135
$host = parse_url( $url, PHP_URL_HOST );
133136

134137
if ( false !== $host ) {
135-
header( 'Access-Control-Allow-Origin: '. $host );
138+
header( 'Access-Control-Allow-Origin: ' . $host );
136139
}
137140
}
138141
}
@@ -376,4 +379,26 @@ public function wpseo_head() {
376379
}
377380
}
378381
}
382+
383+
//////////////////////////////////////////////////
384+
385+
/**
386+
* WordPress SEO
387+
*
388+
* Exclude `pronamic_domain_page` post type from sitemap index,
389+
* as the sitemap for this post type will result in 404's due to external URLs.
390+
*
391+
* @see https://github.com/Yoast/wordpress-seo/blob/3.2.5/inc/sitemaps/class-post-type-sitemap-provider.php#L413-L420
392+
* @see https://github.com/Yoast/wordpress-seo/blob/3.2.5/inc/sitemaps/class-post-type-sitemap-provider.php#L204-L212
393+
*
394+
* @param bool $exclude
395+
* @param string $post_type
396+
*/
397+
public function wpseo_sitemap_exclude_post_type( $exclude, $post_type ) {
398+
if ( 'pronamic_domain_page' === $post_type ) {
399+
$exclude = true;
400+
}
401+
402+
return $exclude;
403+
}
379404
}

‎languages/pronamic_domain_mapping-nl_NL.mo‎

0 Bytes
Binary file not shown.

‎languages/pronamic_domain_mapping-nl_NL.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgstr ""
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/pronamic-domain-"
55
"mapping\n"
66
"POT-Creation-Date: 2016-01-21 15:11:08+00:00\n"
7-
"PO-Revision-Date: 2016-02-12 14:00+0100\n"
7+
"PO-Revision-Date: 2016-09-14 10:53+0100\n"
88
"Last-Translator: Remco Tolsma <info@remcotolsma.nl>\n"
99
"Language-Team: Pronamic <info@pronamic.nl>\n"
1010
"Language: nl_NL\n"

‎languages/pronamic_domain_mapping.pot‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
# This file is distributed under the GPL.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Pronamic Domain Mapping 1.3.0\n"
5+
"Project-Id-Version: Pronamic Domain Mapping 1.3.1\n"
66
"Report-Msgid-Bugs-To: "
77
"https://wordpress.org/support/plugin/pronamic-domain-mapping\n"
8-
"POT-Creation-Date: 2016-02-12 13:00:43+00:00\n"
8+
"POT-Creation-Date: 2016-09-14 08:52:28+00:00\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=utf-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
1212
"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
15-
"X-Generator: grunt-wp-i18n 0.5.3\n"
15+
"X-Generator: grunt-wp-i18n 0.5.4\n"
1616

1717
#: admin/domain-names.php:26
1818
msgid "All"

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pronamic-domain-mapping",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "The Pronamic Domain Mapping plugin allows you to map domains to custom domain name pages.",
55
"repository": {
66
"type": "git",
@@ -18,19 +18,19 @@
1818
},
1919
"homepage": "https://github.com/pronamic/wp-pronamic-domain-mapping",
2020
"devDependencies": {
21-
"grunt": "^0.4.5",
22-
"grunt-aws-s3": "^0.14.4",
21+
"grunt": "^1.0.1",
22+
"grunt-aws-s3": "^0.14.5",
2323
"grunt-checkwpversion": "^0.3.0",
24-
"grunt-contrib-clean": "^0.7.0",
25-
"grunt-contrib-compress": "^0.14.0",
26-
"grunt-contrib-copy": "^0.8.2",
27-
"grunt-contrib-jshint": "^0.12.0",
28-
"grunt-git": "^0.3.7",
24+
"grunt-contrib-clean": "^1.0.0",
25+
"grunt-contrib-compress": "^1.3.0",
26+
"grunt-contrib-copy": "^1.0.0",
27+
"grunt-contrib-jshint": "^1.0.0",
28+
"grunt-git": "^1.0.0",
2929
"grunt-phpcs": "^0.4.0",
3030
"grunt-phplint": "0.0.8",
3131
"grunt-rt-wp-deploy": "^0.1.0",
32-
"grunt-shell": "^1.1.2",
33-
"grunt-wp-i18n": "^0.5.3",
34-
"load-grunt-tasks": "^3.4.0"
32+
"grunt-shell": "^1.3.1",
33+
"grunt-wp-i18n": "^0.5.4",
34+
"load-grunt-tasks": "^3.5.2"
3535
}
3636
}

‎pronamic-domain-mapping.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plugin URI: http://www.pronamic.eu/plugins/pronamic-domain-mapping/
55
Description: The Pronamic Domain Mapping plugin allows you to map domains to custom domain name pages.
66
7-
Version: 1.3.0
7+
Version: 1.3.1
88
Requires at least: 3.2
99
1010
Author: Pronamic

‎readme.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: domain, mapping, landingpage, landingspage, page, dns, map, seo
44
Donate link: http://pronamic.eu/donate/?for=wp-plugin-pronamic-domain-mapping&source=wp-plugin-readme-txt
55
Requires at least: 3.2
66
Tested up to: 4.4
7-
Stable tag: 1.3.0
7+
Stable tag: 1.3.1
88
License: GPLv2 or later
99

1010
The Pronamic Domain Mapping plugin allows you to map domains to custom domain name pages.
@@ -35,7 +35,14 @@ if ( is_readable( $file ) ) {
3535
3. Create a new domain name page by clicking **Add New** in the **Domain Name Pages** menu
3636
4. Enter the domain for which this page should be shown in the field **Domain Name**
3737

38-
To actually visit the just added domain name page, you need to make sure the domain is configured to show your WordPress site. To test the domain name page, just visit the domain for which you're creating the domain name page. If you don't see the domain name page, follow the instructions below if your host uses either the Plesk or DirectAdmin control panel to link the domain to your main domain (which is running the WordPress installation).
38+
To actually visit the just added domain name page, you need to make sure the domain is configured to show your WordPress site. To test the domain name page, just visit the domain for which you're creating the domain name page. If you don't see the domain name page, follow the instructions below if your host uses either the cPanel, Plesk or DirectAdmin control panel to link the domain to your main domain (which is running the WordPress installation).
39+
40+
= Adding a Parked Domain in cPanel =
41+
42+
1. Login to the cPanel control panel
43+
2. Go to "Parked Domains" in the "Domains" section
44+
3. In the section "Create a New Parked Domain", enter the domain of the domain name page and click "Add Domain" (domain root should be the same as your main website and redirection should be disabled for the parked domain)
45+
4. The domain name page should now be shown when you visit the parked domain, but it might take up to 24 hours for changes to take effect.
3946

4047
= Creating a Domain Alias in Plesk =
4148

@@ -67,6 +74,10 @@ Have a question? Make a thread in the support forum and we will get back to you.
6774

6875
== Changelog ==
6976

77+
= 1.3.1 =
78+
* Changed - Removed pronamic_domain_page from WordPress SEO sitemaps.
79+
* Added - Added installation instructions for cPanel.
80+
7081
= 1.3.0 =
7182
* Changed - Return default post link for draft posts.
7283
* Changed - Added support for redirect canonical if post status is concept or private.

0 commit comments

Comments
 (0)