|
@@ -39,7 +39,7 @@ discard block |
|
|
block discarded – undo |
|
39
|
39
|
$targetModel = Morphables::instance($targetUrlRecord->model_type)->find($targetUrlRecord->model_id); |
|
40
|
40
|
|
|
41
|
41
|
if (!$targetModel) { |
|
42
|
|
- throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference [' . $targetUrlRecord->model_type . '@' . $targetUrlRecord->model_id . '] has probably been archived or deleted.'); |
|
|
42
|
+ throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference ['.$targetUrlRecord->model_type.'@'.$targetUrlRecord->model_id.'] has probably been archived or deleted.'); |
|
43
|
43
|
} |
|
44
|
44
|
|
|
45
|
45
|
return static::createRedirect($targetModel->url($locale)); |
|
@@ -49,14 +49,14 @@ discard block |
|
|
block discarded – undo |
|
49
|
49
|
} |
|
50
|
50
|
|
|
51
|
51
|
if (!$model) { |
|
52
|
|
- throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference [' . $urlRecord->model_type . '@' . $urlRecord->model_id . '] has probably been archived or deleted.'); |
|
|
52
|
+ throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference ['.$urlRecord->model_type.'@'.$urlRecord->model_id.'] has probably been archived or deleted.'); |
|
53
|
53
|
} |
|
54
|
54
|
|
|
55
|
55
|
if (method_exists($model, 'isPublished') && !$model->isPublished()) { |
|
56
|
56
|
|
|
57
|
57
|
/** When admin is logged in and this request is in preview mode, we allow the view */ |
|
58
|
58
|
if (!PreviewMode::fromRequest()->check()) { |
|
59
|
|
- throw new NotFoundHttpException('Model found for request [' . $slug . '] but it is not published.'); |
|
|
59
|
+ throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.'); |
|
60
|
60
|
} |
|
61
|
61
|
} |
|
62
|
62
|
|
|
@@ -67,7 +67,7 @@ discard block |
|
|
block discarded – undo |
|
67
|
67
|
} |
|
68
|
68
|
} |
|
69
|
69
|
|
|
70
|
|
- throw new NotFoundHttpException('No url or model found for request [' . $slug . '] for locale [' . $locale . '].'); |
|
|
70
|
+ throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].'); |
|
71
|
71
|
} |
|
72
|
72
|
|
|
73
|
73
|
private static function createRedirect(string $url) |
Please login to merge, or discard this patch.
thinktomorrow /
chief
