|
@@ -23,7 +23,7 @@ discard block |
|
|
block discarded – undo |
|
23
|
23
|
public function __construct($app = null) |
|
24
|
24
|
{ |
|
25
|
25
|
if (!$app) { |
|
26
|
|
- $app = app(); //Fallback when $app is not given |
|
|
26
|
+ $app = app(); //Fallback when $app is not given |
|
27
|
27
|
} |
|
28
|
28
|
$this->app = $app; |
|
29
|
29
|
|
|
@@ -34,11 +34,11 @@ discard block |
|
|
block discarded – undo |
|
34
|
34
|
{ |
|
35
|
35
|
$parameters = array_wrap($parameters); |
|
36
|
36
|
|
|
37
|
|
- if (! empty($parameters[0]) && ($parameters[0] instanceof \Illuminate\Database\Eloquent\Model)) { |
|
|
37
|
+ if (!empty($parameters[0]) && ($parameters[0] instanceof \Illuminate\Database\Eloquent\Model)) { |
|
38
|
38
|
$entity = $parameters[0]; |
|
39
|
39
|
if ($entity->urlAlias) { |
|
40
|
40
|
unset($parameters[0]); |
|
41
|
|
- if (! $this->config->get('url-aliases.use_localization')) { |
|
|
41
|
+ if (!$this->config->get('url-aliases.use_localization')) { |
|
42
|
42
|
$alias = $entity->urlAlias->alias; |
|
43
|
43
|
} elseif ($this->config->get('url-aliases-laravellocalization.origin_default_locale') == $entity->urlAlias->locale && $this->config->get('url-aliases-laravellocalization.hideDefaultLocaleInURL') && !$forceWithLocalePrefix) { |
|
44
|
44
|
$alias = $entity->urlAlias->alias; |
Please login to merge, or discard this patch.