Merge branch 'master' of github.com:hainatravel/information-system into master

application/controllers/information.php

@@ -2465,7 +2465,7 @@ class Information extends CI_Controller
       foreach ($feedback_array[0] as $index => $tag_name) {
         $city_name_string = $feedback_array[1][$index];
         $city_name_list = explode(',', $city_name_string);
-        $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
+        $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list, FALSE);
         // 防止触发 Google 网络垃圾政策只返回前三条
         $top3_feedback_list = array_slice($feedback_list, 0, 3);
         $feedback_content = $this->load->view(
@@ -2489,7 +2489,7 @@ class Information extends CI_Controller
     if (!empty($feedback30_array)) {
       foreach ($feedback30_array[0] as $index => $tag_name) {
         $city_name = $feedback30_array[1][$index];
-        $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
+        $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 30, FALSE);
         $feedback_30_content = $this->load->view(
           'mobile_first/htravel-feedback-30-list',
           array('feedback_list' => $feedback_list),
@@ -2512,7 +2512,7 @@ class Information extends CI_Controller
         $city_name_list = explode(',', $city_name_string);
         $feedback_city_list = [];
         foreach ($city_name_list as $index => $city_name) {
-          $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5);
+          $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5, FALSE);
           $data_name = str_replace(" ", "_", $city_name);
           $feedback_city_list[$data_name] = $feedback_list;
         }