Merge branch 'dev'

bingbaga · Aug 19, 2019 · 3731b90 · 3731b90
2 parents ad09bba + ad093a5
commit 3731b90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/common.php b/application/common.php
@@ -118,7 +118,7 @@ function str_rand($length = 16, $char = '0123456789abcdefghijklmnopqrstuvwxyzABC
  */
 function make_token()
 {
-    return md5('LSKY PRO' . uniqid() . time());
+    return md5('LSKY PRO' . uniqid('', true) . time());
 }
 
 /**

diff --git a/application/index/view/common/base.html b/application/index/view/common/base.html
@@ -178,7 +178,7 @@
 </script>
 {if $user and $user.is_admin and !cookie('?no_update')}
 <script>
-  app.update(thatVer, false);
+  //app.update(thatVer, false);
 </script>
 {/if}
 {$config.statistics_code|raw}
-Original file line number
+Diff line change
@@ Expand Up @@
      */
     function make_token()
     {
-        return md5('LSKY PRO' . uniqid() . time());
+        return md5('LSKY PRO' . uniqid('', true) . time());
     }
     /**
@@ Expand Down @@