Centralise permalink generation

diff --git a/cx/lib/posts.php b/cx/lib/posts.php
index a7ebfa459bb6c5a67feb98fa14d7b1dd71ce5055..326d81c470585f90848e59d57b2ab2ffcbd339d8 100644 (file)
--- a/cx/lib/posts.php
+++ b/cx/lib/posts.php
@@ -45,6 +45,11 @@ class Post {
                }
        }
 
                }
        }
 

+       public function get_permalink_path() {
+               $post_permalink = $this->is_page ? '/' . $this->slug : '/' . date('Y', $this->date) . '/' . date('m', $this->date) . '/' . $this->slug;
+               return $post_permalink;
+       }
+

        public function get_metadata() {
                $data = [];
 
        public function get_metadata() {
                $data = [];
 

diff --git a/cx/templates/public/pages/atom.php b/cx/templates/public/pages/atom.php
index 398443def24a80a16b4f8f24814bae35268399fe..0fa507b19b03440023ead3ffa50567ffbff62fe6 100644 (file)
--- a/cx/templates/public/pages/atom.php
+++ b/cx/templates/public/pages/atom.php
@@ -17,7 +17,7 @@
        </author>
 
 <?php foreach (cx_posts_get() as $post): ?>
        </author>
 
 <?php foreach (cx_posts_get() as $post): ?>

-<?php $post_permalink = '/' . date('Y', $post->date) . '/' . date('m', $post->date) . '/' . $post->slug; ?>
+<?php $post_permalink = $post->get_permalink_path(); ?>

        <entry>
                <id><?= cx_url_site($post_permalink); ?></id>
                <title><?= $post->title ?></title>
        <entry>
                <id><?= cx_url_site($post_permalink); ?></id>
                <title><?= $post->title ?></title>

diff --git a/cx/templates/public/pages/post.php b/cx/templates/public/pages/post.php
index a4123c00fac3d6addc7572c63eabc5d9968f49c9..0a8517618b767b1530415f828a075d47b1ab110c 100644 (file)
--- a/cx/templates/public/pages/post.php
+++ b/cx/templates/public/pages/post.php
@@ -1,6 +1,6 @@
 <?php $post = cx_posts_find_post($post_id); ?>
 <?php $post_metadata = $post->get_metadata(); ?>
 <?php $post = cx_posts_find_post($post_id); ?>
 <?php $post_metadata = $post->get_metadata(); ?>

-<?php $post_permalink = '/' . date('Y', $post->date) . '/' . date('m', $post->date) . '/' . $post->slug; ?>
+<?php $post_permalink = $post->get_permalink_path(); ?>

 <?php cx_template_base('base', ['cx_post_title' => $post->title, 'cx_post_meta' => $post_metadata, 'cx_post_permalink' => $post_permalink]); ?>
 <main>
 <?php if ($post): ?>
 <?php cx_template_base('base', ['cx_post_title' => $post->title, 'cx_post_meta' => $post_metadata, 'cx_post_permalink' => $post_permalink]); ?>
 <main>
 <?php if ($post): ?>