merge index
This commit is contained in:
parent
1f1919e4dd
commit
b62694245e
17
index.php
17
index.php
@ -35,7 +35,6 @@ if($site_type=='web'){
|
||||
|
||||
$smarty->display('web.html');
|
||||
}else{
|
||||
<<<<<<< HEAD
|
||||
$keyword = empty($_REQUEST['keyword']) ? '' : trim($_REQUEST['keyword']);
|
||||
|
||||
// $smarty->assign('description', htmlspecialchars($_CFG['shop_desc']));
|
||||
@ -51,22 +50,6 @@ if($site_type=='web'){
|
||||
$smarty->assign('ad3_list', get_rand5_ad3($site_id));
|
||||
$smarty->assign('ad4_list', get_all_ad4($site_id));
|
||||
$smarty->assign('footer_text', $_CFG['footer_text']);
|
||||
=======
|
||||
$smarty->assign('keywords', htmlspecialchars($_CFG['shop_keywords']));
|
||||
$smarty->assign('description', htmlspecialchars($_CFG['shop_desc']));
|
||||
$smarty->assign('main_domain', MAIN_DOMAIN); // 当前位置
|
||||
$smarty->assign('data_dir', DATA_DIR); // 数据目录
|
||||
$smarty->assign('http', $GLOBALS['ecs']->http());
|
||||
$smarty->assign('ad1_list', get_rand5_ad1($site_id));
|
||||
$smarty->assign('rnd5_portals_1', get_rand5_portals(1));
|
||||
$smarty->assign('rnd5_portals_2', get_rand5_portals(2));
|
||||
$smarty->assign('rnd5_portals_3', get_rand5_portals(3));
|
||||
$smarty->assign('ad2_list', get_rand5_ad2($site_id));
|
||||
$smarty->assign('ad3_list', get_rand5_ad3($site_id));
|
||||
$smarty->assign('ad4_list', get_all_ad4($site_id));
|
||||
$smarty->assign('footer_text', $_CFG['footer_text']);
|
||||
$smarty->assign('category', $category);
|
||||
>>>>>>> bnb
|
||||
|
||||
if($site_id>0){
|
||||
$sql = 'SELECT * FROM ' . $GLOBALS['ecs']->table('portal') .
|
||||
|
Loading…
Reference in New Issue
Block a user