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

application/controllers/information.php

@@ -1203,10 +1203,10 @@ class Information extends CI_Controller
     $template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), true), $template);
     $meta_show_advertise = get_meta($information->ic_id, 'meta_show_advertise');
     //        //广告，改叫tips，防止被插件屏蔽
-    if (!empty ($template_recommand['Tips Right TOP']) && $meta_show_advertise == 'yes') {
+    if (!empty ($template_recommand['Tips Right TOP']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) {
       $template = str_replace('<!--@TIPS-RIGHT-TOP@-->', "<div class='right_brand_info'><aside>" . $template_recommand['Tips Right TOP']->it_content . "</aside></div>", $template);
     }
-    if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') {
+    if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) {
       $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'>" . $template_recommand['Tips Right']->it_content . "</div>", $template);
     }
 
@@ -1246,7 +1246,7 @@ class Information extends CI_Controller
         ),
         true
       );
-      if($meta_show_advertise == 'yes'){
+      if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){
       $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
       }
     }
@@ -1772,7 +1772,7 @@ class Information extends CI_Controller
     if (!empty ($template_recommand['Tips Right TOP'])) {
       // $template = str_replace('<!--@TIPS-RIGHT-TOP@-->', "<div class='right_brand_info'><aside>" . $template_recommand['Tips Right TOP']->it_content . "</aside></div>", $template);
     }
-    if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') {
+    if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) {
       $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'><div class='ah_inforight'>" . $template_recommand['Tips Right']->it_content . "</div></div>", $template);
     }
     // 右侧列表广告
@@ -1807,7 +1807,7 @@ class Information extends CI_Controller
       ),
       true
     );
-    if($meta_show_advertise == 'yes'){
+    if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){
     $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
     }
     //文中的信息推荐
@@ -2120,7 +2120,7 @@ class Information extends CI_Controller
     $template_recommand = $recommand_information;
     $template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($recommand_template, array('recommands' => $template_recommand), true), $template);
     //广告，改叫tips，防止被插件屏蔽
-    if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') {
+    if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) {
       $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'><div class='ah_inforight'>" . $template_recommand['Tips Right']->it_content . "</div></div>", $template);
     }
     // 右侧列表广告
@@ -2157,7 +2157,7 @@ class Information extends CI_Controller
       true
     );
 
-    if($meta_show_advertise == 'yes'){
+    if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){
       $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
     }
     

application/views/mobile_first/ah-pc.php

@@ -227,7 +227,7 @@
             <div class="pc_content">
                 <!--@CUSTOM-CONENT@-->
             </div>
-            <?php if ($meta_show_advertise == 'yes') {?>
+            <?php if ($meta_show_advertise == 'yes' || empty($meta_show_advertise)) {?>
             <div class="right_brand_info">
                 <h3>Why Asia Highlights (10,000+ reviews & 98.8% 5-star rating)</h3>
 

application/views/mobile_first/gh-pc.php

@@ -190,7 +190,7 @@
                     <!--@CUSTOM-CONENT@-->
                 </section>
             </div>
-            <?php if ($meta_show_advertise == 'yes') {?>
+            <?php if (($meta_show_advertise == 'yes' || empty($meta_show_advertise))) {?>
             <div class="right_brand_info">
                 <h3>Why Global Highlights (10,000+ reviews & 98.8% 5-star rating)</h3>