调整官网500后台卡问题

调整官网500后台卡问题，admin.update.移除文档加载完执行hasNewVersion();

src/system/taglib/cattree.lib.php

@@ -10,11 +10,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_cattree(&$ctag, &$refObj)
 {
     global $dsql;
-<<<<<<< Updated upstream
-    $attlist = "showall|,catid|0"; //处理showall在空或不存在时，强制用产品模型id。如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后的前一个属性无效
-=======
     $attlist = "showall|,catid|0"; //showall在空或不存在时，强制用产品模型id；如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后，前一个属性无效
->>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';

src/system/taglib/demotag.lib.php

@@ -12,15 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_demotag(&$ctag, &$refObj)
 {
     global $dsql, $envs;
-<<<<<<< Updated upstream
-    $attlist = "row|10,titlelen|24";
-=======
     $attlist = "row|10,titlelen|30";
->>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';
-    //您需编写的代码，不能用echo之类语法，把最终返回值传给$revalue
+    //不能用echo之类语法，把最终返回值传给$revalue
     $revalue = '您好，欢迎使用DedeBIZ';
     return $revalue;
 }

src/system/taglib/feedback.lib.php

@@ -12,11 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_feedback(&$ctag, &$refObj)
 {
     global $dsql;
-<<<<<<< Updated upstream
-    $attlist = "row|10,titlelen|30,infolen|160,orderby|";
-=======
     $attlist = "row|10,titlelen|30,infolen|150,orderby|";
->>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $innertext = trim($ctag->GetInnerText());

src/system/taglib/infolink.lib.php

@@ -26,11 +26,7 @@ function is_str_float($value){
 function lib_infolink(&$ctag, &$refObj)
 {
     global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_mainsite, $em_nativeplaces, $em_infotypes;
-<<<<<<< Updated upstream
     //$attlist="row|10,titlelen|30";
-=======
-    //$attlist="row|12,titlelen|30";
->>>>>>> Stashed changes
     //FillAttsDefault($ctag->CAttribute->Items,$attlist);
     //extract($ctag->CAttribute->Items, EXTR_SKIP);
     $baseurl = preg_replace("#\/$#", '', $cfg_mainsite);

src/system/taglib/likearticle.lib.php

@@ -12,11 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_likearticle(&$ctag, &$refObj)
 {
     global $dsql;
-<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|30,infolen|160,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90";
-=======
-    $attlist = "row|10,titlelen|30,infolen|150,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90";
->>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';

src/system/taglib/relation.lib.php

@@ -12,11 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_relation(&$ctag, &$refObj)
 {
     global $dsql;
-<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|30,infolen|160,name|default,orderby|";
-=======
-    $attlist = "row|10,titlelen|30,infolen|150,name|default,orderby|";
->>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     if (get_class($refObj) != "Archives") {