Cleanup.

overtrue · May 26, 2017 · 2a495f5 · 2a495f5
1 parent f637eac
commit 2a495f5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/StorageManager.php b/src/StorageManager.php
@@ -224,10 +224,9 @@ protected function error($message)
      */
     protected function formatPath($path, $filename)
     {
-        $time = time();
-        $partials = explode('-', date('Y-y-m-d-H-i-s'));
-        $replacement = ['{yyyy}', '{yy}', '{mm}', '{dd}', '{hh}', '{ii}', '{ss}', '{filename}', '{time}'];
-        $path = str_replace($replacement, array_merge($partials, [$filename, $time]), $path);
+        $replacement = array_merge(explode('-', date('Y-y-m-d-H-i-s')), [$filename, time()]);
+        $placeholders = ['{yyyy}', '{yy}', '{mm}', '{dd}', '{hh}', '{ii}', '{ss}', '{filename}', '{time}'];
+        $path = str_replace($placeholders, $replacement, $path);
 
         //替换随机字符串
         if (preg_match('/\{rand\:([\d]*)\}/i', $path, $matches)) {