合并冲突

application/config/config.php

@@ -907,6 +907,25 @@ $config['templates'] = array(
     'food列表' => 'food_list'
 );
 
+//德语信息模板
+$config['templates_gm'] = array(
+    '通用内容模板' => 'guide_info_detail',
+    '城市-列表模板' => 'city_info_list',
+    '城市-首页模板' => 'city_info_index',
+	'城市-首页模板(GM)' => 'city_info_index_new',
+    '城市-首页模板[简]' => 'city_info_s_index',
+    '城市-景点列表模板' => 'city_info_attractions_list',
+    '城市-景点列表模板[简]' => 'city_info_s_attractions_list',
+    '城市-特色产品模板' => 'city_info_diytour',
+    '城市-一线城市首页' => 'city_info_index_one',
+    '省份-首页' => "area_info_index",
+    '文化模板 [列表式]' => "culture_info_detail_just_list",
+    '文化模板 [单页式]' => 'culture_info_detail_one_page',
+    '文化模板 [导航式]' => 'culture_info_detail_with_category',
+    '信息专题模板' => 'guide_top_series',
+	'空白模板'=>'common_none'
+);
+
 // CHT 信息模板
 $config['templates_cht'] = array(
     '通用内容模板' => 'guide_info_detail',

application/controllers/information.php

@@ -196,6 +196,10 @@ class Information extends CI_Controller {
         if (in_array($this->config->item('site_code'), array('cht'))) {
             $this->config->set_item('templates', $this->config->item('templates_cht'));
         }
+		 if (in_array($this->config->item('site_code'), array('gm'))) {
+            $this->config->set_item('templates', $this->config->item('templates_gm'));
+        }
+		
 
         //信息区域类型
         switch ($data['rootInformation']->ic_ht_area_type) {