Merge pull request #130 from nonmakina/pathFixes

Path fixes
towards-a-new-leftypol · Jan 11, 2021 · 1b0ae8d · 1b0ae8d
2 parents cd09c18 + 87b0e97
commit 1b0ae8d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -266,8 +266,6 @@
 $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';

diff --git 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
@@ -361,12 +361,12 @@ private function generateRecentPosts($threads) {
                                 }
 
                                 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;
                         }