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

application/controllers/information.php

@@ -641,10 +641,10 @@ class Information extends CI_Controller
             $template_path . '-weather-forecast',
             array(),
             true);
-        $template = str_replace(
+        $information->ic_content = str_replace(
             '<!--@WEATHER-FORECAST-BLOCK@-->',
             $weather_forecast_content,
-            $template);
+            $information->ic_content);
 
         //火车票搜索框添加 -- zp
         if ($information->is_parent_id == "278008234") {

application/models/infoMetas_model.php

@@ -4,7 +4,7 @@ class InfoMetas_model extends CI_Model {
 
     function __construct() {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
     }
 
     function add($im_ic_id, $im_key, $im_value) {