Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 5 insertions, 3 deletions

diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 498e9b1fc..9e53849d8 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -659,9 +659,11 @@ class TwitterImport
      */
     function saveStatusAttachments($notice, $status)
     {
-        if (!empty($status->entities) && !empty($status->entities->urls)) {
-            foreach ($status->entities->urls as $url) {
-                File::processNew($url->url, $notice->id);
+        if (common_config('attachments', 'process_links')) {
+            if (!empty($status->entities) && !empty($status->entities->urls)) {
+                foreach ($status->entities->urls as $url) {
+                    File::processNew($url->url, $notice->id);
+                }
             }
         }
     }