Merge branch 'develop'

Application/Home/Controller/PageController.class.php

@@ -38,6 +38,8 @@ class PageController extends BaseController {
         if ($page_id > 0 ) {
             if ($page_history_id) {
                 $page = D("PageHistory")->where(" page_history_id = '$page_history_id' ")->find();
+                $page_content = gzuncompress($page['page_content']); 
+                $page['page_content'] = $page_content ? $page_content : $page['page_content'] ;
             }else{
                 $page = D("Page")->where(" page_id = '$page_id' ")->find();
             }
@@ -110,7 +112,7 @@ class PageController extends BaseController {
                 'item_id'=>$page['item_id'],
                 'cat_id'=>$page['cat_id'],
                 'page_title'=>$page['page_title'],
-                'page_content'=>$page['page_content'],
+                'page_content'=>gzcompress($page['page_content'], 9),
                 's_number'=>$page['s_number'],
                 'addtime'=>$page['addtime'],
                 'author_uid'=>$page['author_uid'],
@@ -183,6 +185,8 @@ class PageController extends BaseController {
 
         if ($PageHistory) {
             foreach ($PageHistory as $key => &$value) {
+                $page_content = gzuncompress($value['page_content']); 
+                $value['page_content'] = $page_content ? $page_content : $value['page_content'] ;
                 $value['addtime'] = date("Y-m-d H:i:s" , $value['addtime']);
             }
         }

Application/Home/Controller/UserController.class.php

@@ -14,7 +14,7 @@ class UserController extends BaseController {
 			  $password = I("password");
 			  $confirm_password = I("confirm_password");
 			  $v_code = I("v_code");
-			  if (C('CloseVerify')) {
+			  if (C('CloseVerify') || $v_code && $v_code == session('v_code') ) {
 		  		if ( $password != '' && $password == $confirm_password) {
 
 			  		if ( ! D("User")->isExist($username) ) {
@@ -32,11 +32,7 @@ class UserController extends BaseController {
 			  		$this->message("两次输入的密码不一致！");
 			  	}
 			  }else{
-				  if ($v_code && $v_code == session('v_code')) {
-				  	
-				  }else{
 				    $this->message("验证码不正确");
-				  }	
 			  }
 			  
 

Application/Home/View/Item/show.html

@@ -49,7 +49,7 @@
 <div class="doc-body row">
   <!-- 左侧栏菜单 -->
     <div class="doc-left span3 bs-docs-sidebar pull-left">
-        <form class="form-search text-center" action="" method="get">
+        <form class="form-search text-center" action="{:U('Home/item/show')}&item_id={$item.item_id}" method="get">
           <div class="input-append search-input-append">
             <i class="icon-blank"></i>
             <input type="text" name="keyword" class="search-query search-query-input" value="{$keyword}">