From 46fe78cf8f589ffc8dc1a35b1232c049d4ea64a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 2 Jan 2014 17:47:19 +0100
Subject: [PATCH] BUGFIX: export rake task should include locally stored
 avatars

---
 app/jobs/regular/exporter.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/jobs/regular/exporter.rb b/app/jobs/regular/exporter.rb
index 41cc4c6c3ba..c82c677e993 100644
--- a/app/jobs/regular/exporter.rb
+++ b/app/jobs/regular/exporter.rb
@@ -90,18 +90,18 @@ module Jobs
 
     def create_tar_file
       filenames = @encoder.filenames
+      tar_filename = "#{@output_base_filename}.tar"
+      upload_directory = "uploads/" + RailsMultisite::ConnectionManagement.current_db
 
-      FileUtils.cd( File.dirname(filenames.first) ) do
-        `tar cvf #{@output_base_filename}.tar #{File.basename(filenames.first)}`
+      FileUtils.cd(File.dirname(filenames.first)) do
+        `tar cvf #{tar_filename} #{File.basename(filenames.first)}`
       end
 
-      FileUtils.cd( File.join(Rails.root, 'public') ) do
-        Upload.find_each do |upload|
-          `tar rvf #{@output_base_filename}.tar #{upload.url[1..-1]}` unless upload.url[0,4] == 'http'
-        end
+      FileUtils.cd(File.join(Rails.root, 'public')) do
+        `tar cvf #{tar_filename} #{upload_directory}`
       end
 
-      `gzip #{@output_base_filename}.tar`
+      `gzip #{tar_filename}`
 
       true
     end