From 694448e0aa81edb7b010f102ee9ee0e6961f6f7c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Mon, 8 Nov 2010 17:36:02 -0800
Subject: Add attachments 'thumb_width' and 'thumb_height' settings for inline
 thumbs, defaulting to 100x75. This is used as the max thumb width/height for
 oEmbed requests (replacing the old default of 500x400 which was more suitable
 for the lightbox).

---
 lib/default.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/default.php')

diff --git a/lib/default.php b/lib/default.php
index a19453fce..87f4e45c0 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -250,6 +250,8 @@ $default =
               'monthly_quota' => 15000000,
               'uploads' => true,
               'filecommand' => '/usr/bin/file',
+              'thumb_width' => 100,
+              'thumb_height' => 75,
               ),
         'application' =>
         array('desclimit' => null),
-- 
cgit v1.2.3-54-g00ecf


From cb124fe831a3c77dfca89590ebb8d691685bb573 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 12 Nov 2010 12:24:55 -0800
Subject: Add a quick config setting to disable/enable display of thumbnails in
 regular notice lists (attachments/show_thumbs) - disabling gives the same
 display as before this feature was added (but changes to oembed handling are
 still there, and the lightbox popup is gone)

---
 lib/default.php    | 1 +
 lib/noticelist.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/default.php')

diff --git a/lib/default.php b/lib/default.php
index 87f4e45c0..ece01f2a8 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -250,6 +250,7 @@ $default =
               'monthly_quota' => 15000000,
               'uploads' => true,
               'filecommand' => '/usr/bin/file',
+              'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
               'thumb_width' => 100,
               'thumb_height' => 75,
               ),
diff --git a/lib/noticelist.php b/lib/noticelist.php
index d2ac7ed84..c6f964662 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -385,8 +385,10 @@ class NoticeListItem extends Widget
     }
 
     function showNoticeAttachments() {
-        $al = new InlineAttachmentList($this->notice, $this->out);
-        $al->show();
+        if (common_config('attachments', 'show_thumbs')) {
+            $al = new InlineAttachmentList($this->notice, $this->out);
+            $al->show();
+        }
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf