Merge remote-tracking branch 'origin/develop/wap' into beta/wap

@@ -359,6 +359,11 @@ class UserModel
     {
     {
         $result = array('code' => 400, 'message' => '出错啦~');
         $result = array('code' => 400, 'message' => '出错啦~');
 
 
+        do {
+            if (empty($skn)) {
+                break;
+            }
+
             $record = UserData::delRecord($uid, $skn);
             $record = UserData::delRecord($uid, $skn);
 
 
             // 处理数据
             // 处理数据
@@ -366,6 +371,7 @@ class UserModel
                 $result['code'] = $record['code'];
                 $result['code'] = $record['code'];
                 $result['message'] = $record['message'];
                 $result['message'] = $record['message'];
             }
             }
+        } while (false);
 
 
         return $result;
         return $result;
     }
     }

@@ -56,7 +56,7 @@ class BrandController extends AbstractAction
     public function searchAction()
     public function searchAction()
     {
     {
         $this->setTitle('品牌一览');
         $this->setTitle('品牌一览');
-        $this->setNavHeader('品牌一览');
+        $this->setNavHeader('品牌一览', true, false);
 
 
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();