Merge branch 'develop'

Application/Home/Controller/CatalogController.class.php

@@ -51,6 +51,8 @@ class CatalogController extends BaseController {
         $data['parent_cat_id'] = $parent_cat_id ;
         if ($parent_cat_id > 0 ) {
            $data['level'] = 3;
+        }else{
+            $data['level'] = 2;
         }
 
         if ($cat_id > 0 ) {
@@ -139,7 +141,7 @@ class CatalogController extends BaseController {
 
         if ($cat_id > 0 ) {
             
-            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->limit(1)->delete();
+            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->delete();
 
         }
         if ($ret) {

Application/Home/Controller/ItemController.class.php

@@ -158,10 +158,10 @@ class ItemController extends BaseController {
         }
 
 
-        D("Page")->where("item_id = '$item_id' ")->limit(1000)->delete();
-        D("Catalog")->where("item_id = '$item_id' ")->limit(100)->delete();
-        D("PageHistory")->where("item_id = '$item_id' ")->limit(1000)->delete();
-        $return = D("Item")->where("item_id = '$item_id' ")->limit(1)->delete();
+        D("Page")->where("item_id = '$item_id' ")->delete();
+        D("Catalog")->where("item_id = '$item_id' ")->delete();
+        D("PageHistory")->where("item_id = '$item_id' ")->delete();
+        $return = D("Item")->where("item_id = '$item_id' ")->delete();
 
         if (!$return) {
             $return['error_code'] = 10103 ;

Application/Home/Controller/MemberController.class.php

@@ -79,7 +79,7 @@ class MemberController extends BaseController {
 
         if ($username) {
             
-            $ret = D("ItemMember")->where(" item_id = '%d' and username = '%s'  ",array($item_id,$username))->limit(1)->delete();
+            $ret = D("ItemMember")->where(" item_id = '%d' and username = '%s'  ",array($item_id,$username))->delete();
 
         }
         if ($ret) {

Application/Home/Controller/PageController.class.php

@@ -173,7 +173,7 @@ class PageController extends BaseController {
 
         if ($page) {
             
-            $ret = D("Page")->where(" page_id = '$page_id' ")->limit(1)->delete();
+            $ret = D("Page")->where(" page_id = '$page_id' ")->delete();
             //更新项目时间
             D("Item")->where(" item_id = '$page[item_id]' ")->save(array("last_update_time"=>time()));