summaryrefslogtreecommitdiff
path: root/inc/display.php
diff options
context:
space:
mode:
authorMichael Walker <mike@barrucadu.co.uk>2015-09-12 21:03:54 +0100
committerMichael Walker <mike@barrucadu.co.uk>2015-09-12 21:03:54 +0100
commit166ba2a0a205c88bdb8fcc6fc538a0bdc01b60d9 (patch)
tree5a7293c0d78804f72e253e385d015162e029777b /inc/display.php
parent05c569e656070f086de49d24749d4b18916975da (diff)
parent844b26216614d953ee8521838f1030ad59d735ec (diff)
Merge remote-tracking branch 'vichan/master'
Diffstat (limited to 'inc/display.php')
-rw-r--r--inc/display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/display.php b/inc/display.php
index e7fb9320..90cf3434 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -354,7 +354,7 @@ class Post {
}
if (isset($this->files) && $this->files)
- $this->files = json_decode($this->files);
+ $this->files = @json_decode($this->files);
$this->subject = utf8tohtml($this->subject);
$this->name = utf8tohtml($this->name);
@@ -404,7 +404,7 @@ class Thread {
}
if (isset($this->files))
- $this->files = json_decode($this->files);
+ $this->files = @json_decode($this->files);
$this->subject = utf8tohtml($this->subject);
$this->name = utf8tohtml($this->name);