From 69bc26033e09f88de292548c7587151f9fd65da6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 26 Oct 2015 10:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2url=E5=88=A0=E5=87=8F?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=20url=E5=8D=9A=E5=AE=A2=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=94=B9=E4=B8=BA20000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blogs_controller.rb | 6 +++++-
 public/javascripts/blog.js          | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index 6be17f1d3..07bf60464 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -28,7 +28,11 @@ class BlogsController < ApplicationController
   end
   private
   def find_blog
-    @blog = Blog.find(params[:blog_id])
+    if params[:blog_id]
+      @blog = Blog.find(params[:blog_id])
+    else
+      render_404
+    end
     if @blog.nil?
       #如果某个user的blog不存在，那么就创建一条
       @blog = Blog.create(:name=>User.find(params[:id]).realname ,
diff --git a/public/javascripts/blog.js b/public/javascripts/blog.js
index 62dbaedc5..feaab0100 100644
--- a/public/javascripts/blog.js
+++ b/public/javascripts/blog.js
@@ -40,8 +40,8 @@ function regexTopicDescription()
         $("#message_content_span").css('color','#ff0000');
         return false;
     }
-    else if(name.length >=6000){
-        $("#message_content_span").text("描述最多3000个汉字(或6000个英文字符)");
+    else if(name.length >=20000){
+        $("#message_content_span").text("描述最多20000个汉字(或40000个英文字符)");
         $("#message_content_span").css('color','#ff0000');
         return false;
     }