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 #1342 from mejt/3

Browse Source 
Added avoiding unhandled exception from Translatable extension in ContentController
This commit is contained in:
Damian Mooyman 2015-12-22 16:58:04 +13:00
commit 43a855e5b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/ContentController.php
View File

@ -155,8 +155,9 @@ class ContentController extends Controller {
// look for a translation and redirect (see #5001). Only happens on the last child in // look for a translation and redirect (see #5001). Only happens on the last child in
// a potentially nested URL chain. // a potentially nested URL chain.
if(class_exists('Translatable')) { if(class_exists('Translatable')) {
if($request->getVar('locale') && $this->dataRecord && $this->dataRecord->Locale != $request->getVar('locale')) { $locale = $request->getVar('locale');
$translation = $this->dataRecord->getTranslation($request->getVar('locale')); if($locale && i18n::validate_locale($locale) && $this->dataRecord && $this->dataRecord->Locale != $locale) {
$translation = $this->dataRecord->getTranslation($locale);
if($translation) { if($translation) {
$response = new SS_HTTPResponse(); $response = new SS_HTTPResponse();
$response->redirect($translation->Link(), 301); $response->redirect($translation->Link(), 301);