Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -32,9 +32,9 @@ class cms_hook_FriendlyUrl extends _HOOK_CLASS_
|
||||
public static function createFriendlyUrlFromComponents( $components, $potentialFurl )
|
||||
{
|
||||
/* If the normal URL handling has it, or this is the root page, use normal handling, unless Pages is the default app, in which case we'll fallback to it */
|
||||
if ( $return = call_user_func_array( 'parent::createFriendlyUrlFromComponents', func_get_args() ) or !$potentialFurl )
|
||||
if ( $return = parent::createFriendlyUrlFromComponents( $components, $potentialFurl ) or !$potentialFurl )
|
||||
{
|
||||
if ( !\IPS\Application::load('cms')->default )
|
||||
if ( !\IPS\Application::load('cms')->default OR $potentialFurl )
|
||||
{
|
||||
return $return;
|
||||
}
|
||||
@@ -85,7 +85,7 @@ class cms_hook_FriendlyUrl extends _HOOK_CLASS_
|
||||
return static::friendlyUrlFromComponent( $protocol, $friendlyUrlComponent, $queryString )->setFriendlyUrlData( $seoTemplate, $seoTitles, array( 'path' => $friendlyUrlComponent ), $friendlyUrlComponent );
|
||||
}
|
||||
|
||||
return call_user_func_array( 'parent::friendlyUrlFromQueryString', func_get_args() );
|
||||
return parent::friendlyUrlFromQueryString( $queryString, $seoTemplate, $seoTitles, $protocol );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -131,7 +131,7 @@ class cms_hook_FriendlyUrl extends _HOOK_CLASS_
|
||||
return $this;
|
||||
}
|
||||
|
||||
return call_user_func_array( 'parent::setFriendlyUrlData', func_get_args() );
|
||||
return parent::setFriendlyUrlData( $seoTemplate, $seoTitles, $matchedParams, $friendlyUrlComponent );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user