tonyair
/
silverstripe-googlesitemaps
mirror of https://github.com/wilr/silverstripe-googlesitemaps.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #110 from mikenz/patch-2 

More Silverstripe 4 compatibility
This commit is contained in:
Will Rossiter 2017-03-22 17:18:06 +13:00 committed by GitHub
parent e0821f8f03 b8766edbee
commit 526a0eec4d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/GoogleSitemap.php
View File

@ -244,7 +244,7 @@ class GoogleSitemap extends Object
}
if($redirector) {
foreach (ClassInfo::subclassesFor('RedirectorPage') as $redirectorClass) {
foreach (ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\RedirectorPage') as $redirectorClass) {
$instances = $instances->exclude('ClassName', $redirectorClass);
}
}

4
code/controllers/GoogleSitemapController.php
View File

@ -38,7 +38,7 @@ class GoogleSitemapController extends Controller
public function index($url)
{
if (GoogleSitemap::enabled()) {
Config::inst()->update('SSViewer', 'set_source_file_comments', false);
Config::inst()->update('SilverStripe\\View\\SSViewer', 'set_source_file_comments', false);
$this->getResponse()->addHeader('Content-Type', 'application/xml; charset="utf-8"');
$this->getResponse()->addHeader('X-Robots-Tag', 'noindex');
@ -66,7 +66,7 @@ class GoogleSitemapController extends Controller
$page = $this->request->param('OtherID');
if (GoogleSitemap::enabled() && $class && $page && ($class == SiteTree::class || $class == 'GoogleSitemapRoute' || GoogleSitemap::is_registered($class))) {
Config::inst()->update('SSViewer', 'set_source_file_comments', false);
Config::inst()->update('SilverStripe\\View\\SSViewer', 'set_source_file_comments', false);
$this->getResponse()->addHeader('Content-Type', 'application/xml; charset="utf-8"');
$this->getResponse()->addHeader('X-Robots-Tag', 'noindex');

2
tests/GoogleSitemapTest.php
View File

@ -405,7 +405,7 @@ class GoogleSitemapTest_OtherDataObject extends DataObject implements TestOnly
class GoogleSitemapTest_UnviewableDataObject extends DataObject implements TestOnly
{
public static $db = array(
private static $db = array(
'Priority' => 'Varchar(10)'
);