* fix bug #2379 and finish task #5247.

2019-01-25 16:59:57 +08:00
parent 9f557ce8dd
commit c995214ff6
1 changed files with 9 additions and 1 deletions
@@ -980,7 +980,15 @@ EOT;
    static public function reload($window = 'self')
    {
        $js  = self::start();
-        $js .= "$window.location.reload(true);\n";
+        // See bug #2379 http://pms.zentao.net/bug-view-2379.html
+        if($window !== 'self' && $window !== 'window')
+        {
+            $js .= "if($window !== window) $window.location.reload(true);\n";
+        }
+        else
+        {
+            $js .= "$window.location.reload(true);\n";
+        }
        $js .= self::end();
        return $js;
    }