diff --git a/application/controllers/information.php b/application/controllers/information.php
index 746f1724..c26ecc8b 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -749,7 +749,7 @@ class Information extends CI_Controller
$template = str_replace('', $information->ic_content, $template);
//Google广告代码
//if (!empty(get_meta($information->ic_id, 'meta_google_ad_content'))) {
- $template = str_replace('', '', $template);
+ $template = str_replace('', '', $template);
//}
if (!empty(get_meta($information->ic_id, 'meta_google_ad_article'))) {
$in_article_google = $this->load->view($template_path . '-google-ad', false, true);
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 1d62ae10..124bb9c6 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -98,9 +98,15 @@ class Welcome extends CI_Controller {
}
//获取某个信息节点和子节点url
+ //$is_parent_id 结构id或者是url
public function create_infomation_urls($is_parent_id, $view = false) {
- $this->output->enable_profiler(FALSE);
- $structure = $this->InfoStructures_model->Detail($is_parent_id);
+ $ic_url=$this->input->get_post('ic_url');
+ if(!empty($ic_url)){
+ $structure = $this->Information_model->Detail($ic_url);
+ }else{
+ $structure = $this->InfoStructures_model->Detail($is_parent_id);
+ }
+
if (empty($structure)) {
show_404();
return false;
diff --git a/application/third_party/advertise/controllers/index.php b/application/third_party/advertise/controllers/index.php
index 3b35b64c..e303e82e 100644
--- a/application/third_party/advertise/controllers/index.php
+++ b/application/third_party/advertise/controllers/index.php
@@ -103,6 +103,9 @@ class Index extends CI_Controller
if (!$result) {
$data[] = array('name' => 'no', 'value' => '关联失败,请联系管理员!');
echo json_encode($data);
+ }else{
+ $data[] = array('name' => 'ok', 'value' => '关联成功!');
+ echo json_encode($data);
}
}
@@ -166,4 +169,25 @@ class Index extends CI_Controller
}
echo $result;
}
+
+ //批量更新广告相关静态页面
+ //$ad_is_id 广告的结构ID
+ /*
+ public function update_www_cache($ad_is_id){
+ $data = array();
+ $data['ad_is_id']=$ad_is_id;
+ $data['advertise'] = $this->advertise_model->get_advertise_treeid($data['ad_is_id']);
+ if(empty($data['advertise'])){
+ show_404();
+ return false;
+ }
+ //广告绑定的页面
+ $data['webpage_list'] = $this->advertise_model->get_advertise_page($data['ad_is_id']);
+ if(!empty($data['webpage_list'])){
+ foreach ($data['webpage_list'] as $item){
+ echo $item->adp_ic_url.'
';
+ }
+ }
+ }
+ */
}
diff --git a/application/third_party/advertise/views/advertise.php b/application/third_party/advertise/views/advertise.php
index fd4c842a..e3ddc473 100644
--- a/application/third_party/advertise/views/advertise.php
+++ b/application/third_party/advertise/views/advertise.php
@@ -41,7 +41,8 @@