From 0611bb6ad1643f167bf9fd17dee32e05d1f0cc6b Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Sun, 10 Jan 2021 19:28:58 -0600
Subject: [PATCH 1/2] Sets the correct default path in the config.php, and
 removes the re-write in instance-config. The path set in config was
 incorrect, so there is no benefit in keeping it incorrect and overwriting in
 instance config. And now that it's correct, it's no benefit to have a
 duplicate setting.

---
 inc/config.php          | 4 ++--
 inc/instance-config.php | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 21957077..241e27da 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -794,9 +794,9 @@
 	// Location of above images.
 	$config['file_thumb'] = 'static/%s';
 	// Location of thumbnail to use for spoiler images.
-	$config['spoiler_image'] = '/static/spoiler.png';
+	$config['spoiler_image'] = 'static/spoiler.png';
 	// Location of thumbnail to use for deleted images.
-	$config['image_deleted'] = '/static/deleted.png';
+	$config['image_deleted'] = 'static/deleted.png';
 
 	// When a thumbnailed image is going to be the same (in dimension), just copy the entire file and use
 	// that as a thumbnail instead of resizing/redrawing.
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 90192586..c5be079d 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -265,8 +265,6 @@ $config['stylesheets']['Dark'] = 'dark.css';
 $config['stylesheets']['Dark Red'] = 'dark_red.css';
 $config['always_noko'] = true;
 $config['spoiler_images'] = true;
-$config['spoiler_image'] = 'static/spoiler.png';
-$config['image_deleted'] = 'static/deleted.png';
 
 //more themes (issue#26)
 $config['stylesheets']['Burichan'] = 'burichan.css';

From 87b0e972ee4e2c668a3f7019d47363d7e3fba411 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Sun, 10 Jan 2021 19:45:31 -0600
Subject: [PATCH 2/2] fixes path for image_deleted

---
 templates/post/fileinfo.html       | 2 +-
 templates/themes/catalog/theme.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index b3473114..a551e8bb 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -5,7 +5,7 @@
     {% for file in post.files %}
         <div class="file{% if post.num_files > 1 %} multifile" style="width:{{ file.thumbwidth + 40 }}px"{% else %}"{% endif %}>
 	{% if file.file == 'deleted' %}
-		<img class="post-image deleted" src="{{ config.image_deleted }}" alt="" />
+		<img class="post-image deleted" src="{{ config.root }}{{ config.image_deleted }}" alt="" />
 	{% else %}
 		<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ file.file }}" target="_blank">{{ file.file }}</a> <span class="details">
 		(
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 63ced223..75ba3a72 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -361,12 +361,12 @@
                                 }
 
                                 if (empty($post['file']))
-                                    $post['file'] = $config['image_deleted'];
+                                    $post['file'] = $config['root'] . $config['image_deleted'];
                             } else {
-                                $post['file'] = $config['image_deleted'];
+                                $post['file'] = $config['root'] . $config['image_deleted'];
                             }
                         } else if($files[0]->thumb == 'spoiler') {
-                            $post['file'] = '/' . $config['spoiler_image'];
+                            $post['file'] = $config['root'] . $config['spoiler_image'];
                         } else {
                             $post['file'] = $config['uri_thumb'] . $files[0]->thumb;
                         }