Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/avatar_controller.rb

@@ -29,51 +29,43 @@ class AvatarController < ApplicationController
     end
 
     if  @temp_file && (@temp_file.size > 0)
-      if @temp_file.size > Setting.upload_avatar_max_size.to_i
+      diskfile=disk_filename(@source_type,@source_id)
-        @status = 1
+      @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
-        @msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
-      elsif Trustie::Utils::Image.new(@temp_file.tempfile.path).image?
-        diskfile=disk_filename(@source_type,@source_id)
-        @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
 
-        # 用户头像上传时进行特别处理
+      # 用户头像上传时进行特别处理
-        if  @source_type == 'User'
+      if  @source_type == 'User'
-          diskfile += "temp"
+        diskfile += "temp"
-          @urlfile += "temp"
+        @urlfile += "temp"
-        end
-
-        logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
-        path = File.dirname(diskfile)
-        unless File.directory?(path)
-          FileUtils.mkdir_p(path)
-        end
-        md5 = Digest::MD5.new
-        File.open(diskfile, "wb") do |f|
-          if @temp_file.respond_to?(:read)
-            buffer = ""
-            while (buffer = @temp_file.read(8192))
-              f.write(buffer)
-              md5.update(buffer)
-            end
-          else
-            f.write(@temp_file)
-            md5.update(@temp_file)
-          end
-        end
-
-        Trustie::Utils::Image.new(diskfile,true).compress(300)
-        @status = 0
-        @msg = ''
-      else
-        @status = 2
-        @msg = l(:not_valid_image_file)
       end
+
+      logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
+      path = File.dirname(diskfile)
+      unless File.directory?(path)
+        FileUtils.mkdir_p(path)
+      end
+      md5 = Digest::MD5.new
+      File.open(diskfile, "wb") do |f|
+        if @temp_file.respond_to?(:read)
+          buffer = ""
+          while (buffer = @temp_file.read(8192))
+            f.write(buffer)
+            md5.update(buffer)
+          end
+        else
+          f.write(@temp_file)
+          md5.update(@temp_file)
+        end
+      end
+#    self.digest = md5.hexdigest
     end
     @temp_file = nil
 
+    image = Trustie::Utils::Image.new(diskfile,true)
+    image.compress(300)
+
     respond_to do |format|
       format.json{
-        render :inline => {status: @status, message:@msg, url:"#{@urlfile.to_s}?#{Time.now.to_i}"}.to_json,:content_type => 'text/html'
+        render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html'
         return
       }
       format.js

app/views/memos/quote.js.erb

@@ -1,4 +1,5 @@
 //ckeditor.setData("<%= raw escape_javascript(@content) %>");
 $('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 $('#quote').val("<%= raw escape_javascript(@content) %>");
-showAndScrollTo("new_memo", "cke_editor01");
+showAndScrollTo("new_memo", "cke_editor01");
+$("img").removeAttr("align");

app/views/memos/show.html.erb

@@ -182,4 +182,5 @@
             }
         });
     };
+        $("img").removeAttr("align");
 </script>