tonyair/silverstripe-googlesitemaps
1
0
Fork 0
mirror of https://github.com/wilr/silverstripe-googlesitemaps.git synced 2024-10-22 11:05:48 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.6' into 1

Browse Source
This commit is contained in:
Daniel Hensby 2018-03-07 11:45:50 +00:00
commit 776e6bd9d9
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@ -4,34 +4,40 @@ sudo: false
language: php language: php
dist: precise
php: php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0 - 7.0
- 7.1
env: env:
- DB=MYSQL CORE_RELEASE=3.2 - DB=MYSQL CORE_RELEASE=3.6
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=3.5
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1 env: DB=PGSQL CORE_RELEASE=3.6
- php: 5.6 - php: 7.2
env: DB=PGSQL CORE_RELEASE=3.2 env: CORE_RELEASE=3
- php: nightly
env: CORE_RELEASE=3
allow_failures: allow_failures:
- php: 7.0 - php: 7.2
env: CORE_RELEASE=3
- php: nightly
env: CORE_RELEASE=3
before_script: before_script:
- composer self-update || true - composer self-update || true
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss - cd ~/builds/ss
- composer install
- composer require wilr/silverstripe-googlesitemaps
script: script:
- vendor/bin/phpunit googlesitemaps/tests - vendor/bin/phpunit googlesitemaps/tests

2
README.md
View File

@ -1,6 +1,6 @@
# Google Sitemaps Module # Google Sitemaps Module
[![Build Status](https://secure.travis-ci.org/wilr/silverstripe-googlesitemaps.png?branch=master)](http://travis-ci.org/wilr/silverstripe-googlesitemaps) [![Build Status](https://secure.travis-ci.org/wilr/silverstripe-googlesitemaps.png?branch=1)](http://travis-ci.org/wilr/silverstripe-googlesitemaps)
## Maintainer Contact ## Maintainer Contact

9
code/extensions/GoogleSitemapExtension.php
View File

@ -18,6 +18,15 @@ class GoogleSitemapExtension extends DataExtension
if ($this->owner->hasMethod('AbsoluteLink')) { if ($this->owner->hasMethod('AbsoluteLink')) {
$hostHttp = parse_url(Director::protocolAndHost(), PHP_URL_HOST); $hostHttp = parse_url(Director::protocolAndHost(), PHP_URL_HOST);
// Subsite support
if (class_exists('Subsite')) {
// Subsite will have a different domain from Director::protocolAndHost
if ($subsite = Subsite::currentSubsite()) {
$hostHttp = parse_url(Director::protocol() . $subsite->getPrimaryDomain(), PHP_URL_HOST);
}
}
$objHttp = parse_url($this->owner->AbsoluteLink(), PHP_URL_HOST); $objHttp = parse_url($this->owner->AbsoluteLink(), PHP_URL_HOST);
if ($objHttp != $hostHttp) { if ($objHttp != $hostHttp) {