diff --git a/.gitignore b/.gitignore index 47901456..87794a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ */paypal_activities/* /author/document/* /application/libraries/composer +/application/config/database.php + + diff --git a/application/controllers/information.php b/application/controllers/information.php index 0e3c1cc4..d116c5ba 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -979,6 +979,12 @@ class Information extends CI_Controller array('information' => $information, 'author' => $author), true); $template = str_replace('', $article_structured_data_content, $template); + $product_code = get_meta($information->ic_id, 'meta_product_code'); + if (!empty($product_code)) { + // + $product_code_input = ""; + $template = str_replace('', $product_code_input, $template); + } //信息推荐 $template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来,pc和移动只需要查一次,减少数据库负担 diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php index 1d882814..6e32a53a 100644 --- a/application/models/infoContents_model.php +++ b/application/models/infoContents_model.php @@ -8,7 +8,7 @@ class InfoContents_model extends CI_Model function __construct() { parent::__construct(); - $this->HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('INFORMATION', TRUE); } public function add_use_ORM($table, $data) { diff --git a/application/models/infoStructures_model.php b/application/models/infoStructures_model.php index ea567fd5..c00d3605 100644 --- a/application/models/infoStructures_model.php +++ b/application/models/infoStructures_model.php @@ -8,7 +8,7 @@ class InfoStructures_model extends CI_Model function __construct() { parent::__construct(); - $this->HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('INFORMATION', TRUE); } diff --git a/application/models/information_model.php b/application/models/information_model.php index a25db8a9..72dfb67d 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -19,7 +19,7 @@ class Information_model extends CI_Model { function __construct() { parent::__construct(); - $this->HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('INFORMATION', TRUE); } function init() { diff --git a/application/third_party/recommend/models/infoRecommends_model.php b/application/third_party/recommend/models/infoRecommends_model.php index ea6504b7..ebd60a8a 100644 --- a/application/third_party/recommend/models/infoRecommends_model.php +++ b/application/third_party/recommend/models/infoRecommends_model.php @@ -9,7 +9,7 @@ class infoRecommends_model extends CI_Model function __construct() { parent::__construct(); - $this->HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('INFORMATION', TRUE); } public function init() { diff --git a/application/third_party/recommend/models/infoTips_model.php b/application/third_party/recommend/models/infoTips_model.php index 4745e170..18344f65 100644 --- a/application/third_party/recommend/models/infoTips_model.php +++ b/application/third_party/recommend/models/infoTips_model.php @@ -9,7 +9,7 @@ class infoTips_model extends CI_Model function __construct() { parent::__construct(); - $this->HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('INFORMATION', TRUE); } public function init() { diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 7ea2bc55..80c165d4 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -146,8 +146,6 @@
Tour Code:
-Tour type: One Day Trips (Private Tour)
from US $ p/p
diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index f0a332a7..a8c16d4d 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -143,8 +143,6 @@Tour Code:
-Tour type: One Day Trips (Private Tour)
from US $ p/p
diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 0dfe2981..d31cde41 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -234,6 +234,7 @@ height="0" width="0" style="display:none;visibility:hidden"> placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"> +