openrat-cms

commit ffc92a696bad3708f5e18bb63c3b6f047a663f0e
parent 869eeb0ee58c4af6730582ce24a55aebd605d1e5
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat,  2 Jul 2022 00:37:22 +0200

Fix: Public Filename must consider the filename style.

Diffstat:
M
modules/cms/generator/PageGenerator.class.php
 | 
2
+-
M
modules/cms/model/Project.class.php
 | 
5
+++++

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/cms/generator/PageGenerator.class.php b/modules/cms/generator/PageGenerator.class.php
@@ -127,7 +127,7 @@ class PageGenerator extends BaseGenerator
 
 		$publishConfig = Configuration::subset('publish');
 		$format = $publishConfig->get('format','{filename}{language_sep}{language}{type_sep}{type}');
-		$format = str_replace('{filename}',$page->filename,$format );
+		$format = str_replace('{filename}',$page->filename(),$format );
 
 		$allLanguages = $project->getLanguageIds();
 		$allModels    = $project->getModelIds();
diff --git a/modules/cms/model/Project.class.php b/modules/cms/model/Project.class.php
@@ -47,16 +47,21 @@ class Project extends ModelBase
 	public $content_negotiation = false;
 
     /**
+	 * Should links to index pages contain the filename?
+	 *
      * @var boolean
      */
 	public $cut_index = false;
 
     /**
+	 * Link to files with extension
+	 *
      * @var boolean
      */
     public $publishFileExtension = true;
 
     /**
+	 * link to pages with extension
      * @var boolean
      */
     public $publishPageExtension = true;