Merge branch 'master' of git.mycht.cn:developers/information-system

# Conflicts:
#	media/popselectpicture.php

application/controllers/information.php

@@ -394,7 +394,7 @@ class Information extends CI_Controller {
                 $update_info_log = $this->update_cache($ic_url, true);
             } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) {
                 $update_info_log = $this->update_cache($ic_url);
-            } else if (strcasecmp($site_code, "cht") != 0) {
+            } else if (strcasecmp($site_code, "cht") != 0) {//非cht站点
                 $update_info_log = $this->update_cache($ic_url);
             }
 

application/views/bootstrap3/information_edit.php

@@ -1183,7 +1183,7 @@
                         <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
                     </label>
                     <div class="clearfix"></div>
-                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah')) { ?>
+                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm') ) { ?>
                         <label class="col-xs-24">本站会自动更新静态页面</label>
 <?php } else { ?>
                         <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">