From 96a49ee28c462f4a516d0b79a4e6f6a833ca3120 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 2 Jul 2019 18:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/application/common.php b/application/common.php
index 585e0990d..50b50433b 100755
--- a/application/common.php
+++ b/application/common.php
@@ -392,20 +392,31 @@ function DataReturn($msg = '', $code = 0, $data = '')
 function CurrentScriptName()
 {
     $name = '';
-    if(!empty($_SERVER['SCRIPT_NAME']))
+    if(empty($_SERVER['SCRIPT_NAME']))
     {
-        if(!empty($_SERVER['SCRIPT_FILENAME']))
+        if(empty($_SERVER['PHP_SELF']))
         {
-            $loc = strripos($_SERVER['SCRIPT_FILENAME'], '/');
-            if($loc !== false)
+            if(!empty($_SERVER['SCRIPT_FILENAME']))
             {
-                $name = substr($_SERVER['SCRIPT_FILENAME'], $loc);
+                $name = $_SERVER['SCRIPT_FILENAME'];
             }
+        } else {
+            $name = $_SERVER['PHP_SELF'];
         }
     } else {
         $name = $_SERVER['SCRIPT_NAME'];
     }
-    return str_replace('/', '', $name);
+
+    if(!empty($name))
+    {
+        $loc = strripos($name, '/');
+        if($loc !== false)
+        {
+            $name = substr($name, $loc+1);
+        } 
+    }
+
+    return $name;
 }
 
 /**