Merge pull request top-think#413 from 772807886/master

liu21st · liu21st · commit 3ed6b77b9721 · 2016-04-18T18:21:00.000+08:00
修改了IpLocation类的构造函数
diff --git a/ThinkPHP/Library/Org/Net/IpLocation.class.php b/ThinkPHP/Library/Org/Net/IpLocation.class.php
@@ -54,7 +54,10 @@ class IpLocation
     public function __construct($filename = "UTFWry.dat")
     {
         $this->fp = 0;
-        if (($this->fp = fopen(dirname(__FILE__) . '/' . $filename, 'rb')) !== false) {
+        if(!is_file($filename)) {
+            $filename = dirname(__FILE__) . '/' . $filename;
+        }
+        if (($this->fp = fopen($filename, 'rb')) !== false) {
             $this->firstip = $this->getlong();
             $this->lastip  = $this->getlong();
             $this->totalip = ($this->lastip - $this->firstip) / 7;
