tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-18 10:41:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Daniel Hensby 2016-06-13 14:35:40 +01:00
commit ea81389a18
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/OldPageRedirector.php
View File

@ -12,13 +12,18 @@ class OldPageRedirector extends Extension {
public function onBeforeHTTPError404($request) {
// We need to get the URL ourselves because $request->allParams() only has a max of 4 params
$params = preg_split('|/+|', $request->getURL());
$cleanURL = trim(Director::makeRelative($request->getURL(false), '/'));
$getvars = $request->getVars();
unset($getvars['url']);
$page = self::find_old_page($params);
$cleanPage = trim(Director::makeRelative($page), '/');
if (!$cleanPage) {
$cleanPage = Director::makeRelative(RootURLController::get_homepage_link());
}
if ($page) {
if ($page && $cleanPage != $cleanURL) {
$res = new SS_HTTPResponse();
$res->redirect(
Controller::join_links(

5
composer.json
View File

@ -22,11 +22,6 @@
"silverstripe/reports": "~3.4",
"silverstripe/siteconfig": "~3.4"
},
"extra": {
"branch-alias": {
"3.x-dev": "3.4.x-dev"
}
},
"autoload": {
"classmap": ["tests/behat/"]
},

4
tests/model/SiteTreeTest.php
View File

@ -956,9 +956,9 @@ class SiteTreeTest extends SapphireTest {
$valid = $classB->doValidate();
$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
$classB->ParentID = $classC->ID;
$classB->ParentID = $classCext->ID;
$valid = $classB->doValidate();
$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
$this->assertTrue($valid->valid(), "Extensions of allowed classes are incorrectly reported as invalid");
$classCext->ParentID = $classD->ID;
$valid = $classCext->doValidate();