Merge branch 'danpros:master' into master

This commit is contained in:
sb0001 2024-03-03 11:03:43 +01:00 committed by GitHub
commit e35cc2c0ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 65 additions and 47 deletions

View file

@ -1010,7 +1010,9 @@ function find_draft_page($static = null)
$tmp = array();
if (config('views.counter') == 'true') {
$counter = config('views.counter');
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -1052,7 +1054,7 @@ function find_draft_page($static = null)
// Get the contents and convert it to HTML
$post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('page_' . $post->slug, $post->file, $views);
} else {
$post->views = null;
@ -1078,7 +1080,9 @@ function find_draft_subpage($static = null, $sub_static = null)
$tmp = array();
if (config('views.counter') == 'true') {
$counter = config('views.counter');
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -1129,7 +1133,7 @@ function find_draft_subpage($static = null, $sub_static = null)
// Get the contents and convert it to HTML
$post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('subpage_' . $post->parentSlug .'.'. $post->slug, $post->file, $views);
} else {
$post->views = null;