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 pull request #1360 from kinglozzer/1359-link-tracking-regex

Browse Source 
FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359)
This commit is contained in:
Damian Mooyman 2016-01-12 11:03:32 +13:00
commit b1387641bf
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/model/SiteTreeLinkTracking.php
View File

@ -217,14 +217,18 @@ class SiteTreeLinkTracking_Parser {
$matches = array(); $matches = array();
if(preg_match('/\[sitetree_link(?:\s*|%20|,)?id=([0-9]+)\](#(.*))?/i', $href, $matches)) { if(preg_match('/\[sitetree_link(?:\s*|%20|,)?id=([0-9]+)\](#(.*))?/i', $href, $matches)) {
$page = DataObject::get_by_id('SiteTree', $matches[1]); $page = DataObject::get_by_id('SiteTree', $matches[1]);
$broken = false;
if (!$page) { if (!$page) {
// Page doesn't exist. // Page doesn't exist.
$broken = true; $broken = true;
} else if (!empty($matches[3]) && !preg_match("/(name|id)=\"{$matches[3]}\"/", $page->Content)) { } else if (!empty($matches[3])) {
// Broken anchor on the target page. $anchor = preg_quote($matches[3], '/');
$broken = true;
} else { if (!preg_match("/(name|id)=\"{$anchor}\"/", $page->Content)) {
$broken = false; // Broken anchor on the target page.
$broken = true;
}
} }
$results[] = array( $results[] = array(

1
tests/model/SiteTreeLinkTrackingTest.php
View File

@ -32,6 +32,7 @@ class SiteTreeLinkTrackingTest extends SapphireTest {
$this->assertFalse($this->isBroken("<a href=\"[sitetree_link,id=$page->ID]#yes-name-anchor\">link</a>")); $this->assertFalse($this->isBroken("<a href=\"[sitetree_link,id=$page->ID]#yes-name-anchor\">link</a>"));
$this->assertFalse($this->isBroken("<a href=\"[sitetree_link,id=$page->ID]#yes-id-anchor\">link</a>")); $this->assertFalse($this->isBroken("<a href=\"[sitetree_link,id=$page->ID]#yes-id-anchor\">link</a>"));
$this->assertFalse($this->isBroken("<a href=\"[file_link,id=$file->ID]\">link</a>")); $this->assertFalse($this->isBroken("<a href=\"[file_link,id=$file->ID]\">link</a>"));
$this->assertTrue($this->isBroken("<a href=\"[sitetree_link,id=$page->ID]#http://invalid-anchor.com\"></a>"));
} }
function highlight($content) { function highlight($content) {