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

hotfix/paypal-note
candice 2 years ago
commit 145ffaea53

@ -545,7 +545,7 @@ class Information extends CI_Controller
echo json_encode(array('name' => 'yes', 'data' => '更新成功!'));
return true;
} else {
echo json_encode(array('name' => 'no', 'data' => '没有发布静态页面'));
echo json_encode(array('name' => 'no', 'data' => '没有发布静态页面: ' . $information->ic_url));
return false;
}
}
@ -1037,7 +1037,8 @@ class Information extends CI_Controller
$template = str_replace(
'<!--@CHINA-TRAINS-CSS@-->',
'<link href="https://proxy-data.chinahighlights.com/css/china-trains.css" rel="stylesheet">',
$template);
$template
);
}
//额外样式
$meta_addon_css = get_meta($information->ic_id, 'meta_addon_css');

Loading…
Cancel
Save