Merge branch 'release/v20170302.3'

kcfinder/core/class/uploader.php

@@ -150,7 +150,7 @@ class uploader {
 
         // SECURING THE SESSION
         $stamp = array(
-            'ip' => $_SERVER['REMOTE_ADDR'],
+            'ip' => $_SERVER['REMOTE_HOST'], //$_SERVER['REMOTE_ADDR'] 2017-03-02 ycc CDN之后的ip会经常变，所以改为域名
             'agent' => md5($_SERVER['HTTP_USER_AGENT'])
         );
         if (!isset($this->session['stamp']))
@@ -404,6 +404,7 @@ class uploader {
     }
 
     protected function checkFilePath($file) {
+		return true; //ycc 2017-03-02 不知道检测什么，取消掉，为了保证虚拟路径可以用
         $rPath = realpath($file);
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN")
             $rPath = str_replace("\\", "/", $rPath);