Merge pull request #622 from getgrav/feature/fix-Append-URL-extension-home-link

Remove any URL extension for the home link
This commit is contained in:
Andy Miller
2016-01-24 18:36:03 -07:00

View File

@@ -138,8 +138,6 @@ class Page
$this->published();
$this->urlExtension();
// some extension logic
if (empty($extension)) {
$this->extension('.'.$file->getExtension());
@@ -147,7 +145,6 @@ class Page
$this->extension($extension);
}
// extract page language from page extension
$language = trim(basename($this->extension(), 'md'), '.') ?: null;
$this->language($language);
@@ -974,6 +971,10 @@ class Page
*/
public function urlExtension()
{
if ($this->home()) {
return '';
}
// if not set in the page get the value from system config
if (empty($this->url_extension)) {
$this->url_extension = trim(isset($this->header->append_url_extension) ? $this->header->append_url_extension : self::getGrav()['config']->get('system.pages.append_url_extension', false));