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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Daniel Hensby 2017-07-20 10:31:55 +01:00
commit df68e34398
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -12,8 +12,6 @@ env:
- DB=MYSQL CORE_RELEASE=3.1 - DB=MYSQL CORE_RELEASE=3.1
matrix: matrix:
allow_failures:
- php: hhvm-nightly
include: include:
- php: 5.6 - php: 5.6
env: DB=MYSQL env: DB=MYSQL
@ -23,9 +21,6 @@ matrix:
env: DB=MYSQL env: DB=MYSQL
- php: 5.3 - php: 5.3
env: DB=MYSQL env: DB=MYSQL
- php: hhvm
env: DB=MYSQL
before_install:
before_script: before_script:

4
code/extensions/BlogMemberExtension.php
View File

@ -37,6 +37,10 @@ class BlogMemberExtension extends DataExtension
{ {
$count = 1; $count = 1;
if ($this->owner->URLSegment && !$this->owner->isChanged('FirstName') && !$this->owner->isChanged('Surname')) {
return;
}
$this->owner->URLSegment = $this->generateURLSegment(); $this->owner->URLSegment = $this->generateURLSegment();
while (!$this->validURLSegment()) { while (!$this->validURLSegment()) {