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

Merge 3.2 into 3.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-04-26 01:50:03 +01:00
commit 06d882b49c
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -34,6 +34,7 @@ matrix:
before_script: before_script:
- composer self-update || true - composer self-update || true
- phpenv rehash - phpenv rehash
- phpenv config-rm xdebug.ini
- 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
- "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi" - "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi" - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"

3
code/model/SiteTreeLinkTracking.php
View File

@ -259,12 +259,13 @@ class SiteTreeLinkTracking_Parser {
// Local anchor. // Local anchor.
$matches = array(); $matches = array();
if(preg_match('/^#(.*)/i', $href, $matches)) { if(preg_match('/^#(.*)/i', $href, $matches)) {
$anchor = preg_quote($matches[1], '#');
$results[] = array( $results[] = array(
'Type' => 'localanchor', 'Type' => 'localanchor',
'Target' => null, 'Target' => null,
'Anchor' => $matches[1], 'Anchor' => $matches[1],
'DOMReference' => $link, 'DOMReference' => $link,
'Broken' => !preg_match("#(name|id)=\"{$matches[1]}\"#", $htmlValue->getContent()) 'Broken' => !preg_match("#(name|id)=\"{$anchor}\"#", $htmlValue->getContent())
); );
continue; continue;

2
code/reports/BrokenLinksReport.php
View File

@ -112,7 +112,7 @@ class BrokenLinksReport extends SS_Report {
$stageLink = $item->AbsoluteLink(); $stageLink = $item->AbsoluteLink();
return sprintf('%s <a href="%s">%s</a>', return sprintf('%s <a href="%s">%s</a>',
$stageLink, $stageLink,
$liveLink ? $liveLink : $stageLink . '?stage=Stage', $liveLink ? $liveLink : Controller::join_links($stageLink, '?stage=Stage'),
$liveLink ? '(live)' : '(draft)' $liveLink ? '(live)' : '(draft)'
); );
} }

1
tests/model/SiteTreeLinkTrackingTest.php
View File

@ -20,6 +20,7 @@ class SiteTreeLinkTrackingTest extends SapphireTest {
$this->assertFalse($this->isBroken('<a name="anchor">anchor</a>')); $this->assertFalse($this->isBroken('<a name="anchor">anchor</a>'));
$this->assertFalse($this->isBroken('<a id="anchor">anchor</a>')); $this->assertFalse($this->isBroken('<a id="anchor">anchor</a>'));
$this->assertTrue($this->isBroken('<a href="##anchor">anchor</a>'));
$page = new Page(); $page = new Page();
$page->Content = '<a name="yes-name-anchor">name</a><a id="yes-id-anchor">id</a>'; $page->Content = '<a name="yes-name-anchor">name</a><a id="yes-id-anchor">id</a>';