Authored by xiaowei

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -39,8 +39,10 @@ class ListController extends WebAction @@ -39,8 +39,10 @@ class ListController extends WebAction
39 'rowNum' => FILTER_VALIDATE_INT, 39 'rowNum' => FILTER_VALIDATE_INT,
40 'page' => FILTER_VALIDATE_INT), false); 40 'page' => FILTER_VALIDATE_INT), false);
41 //字符转码 41 //字符转码
42 - foreach($condition as $key => $val){  
43 - $condition[$key] = rawurldecode($val); 42 + if (!empty($condition)) {
  43 + foreach ($condition as $key => $val) {
  44 + $condition[$key] = rawurldecode($val);
  45 + }
44 } 46 }
45 //性別(频道) 47 //性別(频道)
46 $gender_cookie = !isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender']=='2,3' ? 2 : 1); 48 $gender_cookie = !isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender']=='2,3' ? 2 : 1);