Merge branch 'adminstyle' into develop

src/apps/list.php

@@ -24,7 +24,6 @@ if (!empty($channelid) && empty($tid)) {
     $tinfos = $dsql->GetOne("SELECT ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$tid' ");
 }
 if (empty($tinfos)) die( DedeAlert("栏目信息获取失败，请检查是否存在当前栏目", ALERT_DANGER));
-
 if ($tinfos['issystem'] == -1) {
     $nativeplace = ((empty($nativeplace) || !is_numeric($nativeplace)) ? 0 : $nativeplace);
     $infotype = ((empty($infotype) || !is_numeric($infotype)) ? 0 : $infotype);

src/system/common.func.php

@@ -702,10 +702,8 @@ function DedeSearchAPIURL($action, $parms=array())
     //拼接完整URL
     $finalQueryString = http_build_query($parms);
     $finalUrl = $baseUrl . '?' . $finalQueryString;
-
     return $finalUrl;
 }
-
 function ConvertMysqlToSqlite($mysqlQuery) {
     //移除CHARACTER SET和COLLATE
     $query = preg_replace('/character set \S+/i', '', $mysqlQuery);
@@ -787,7 +785,6 @@ function ConvertMysqlToSqlite($mysqlQuery) {
     $query = str_ireplace('rand', 'RANDOM', $query);
     return trim($query);
 }
-
 function ThemeInclude($path)
 {
     global $cfg_basedir, $cfg_templets_dir, $cfg_df_style;

src/system/extend.func.php

@@ -9,7 +9,5 @@ if (!defined('DEDEINC')) exit ('dedebiz');
  * @license        GNU GPL v2 (https://www.dedebiz.com/license)
  * @link           https://www.dedebiz.com
  */
-// 当前文件用于用户进行自定义扩展函数，官方开发不要动这个文件
-
-
+//当前文件用于用户进行自定义扩展函数，官方开发不要动这个文件
 ?>

src/system/taglib/channel/softlinks.lib.php

@@ -59,7 +59,7 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row)
             //分析本地链接
             if (!isset($firstLink) && $islocal == 1) $firstLink = $link;
             if ($islocal == 1 && $row['islocal'] != 1) continue;
-            //支持http,迅雷下载,ftp,flashget
+            //支持http、迅雷下载、ftp、flashget
             if (!preg_match("#^(http|https):\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link) && $cfg_multi_site == 'Y') {
                 $link = $cfg_mainsite.$link;
             }