Merge commit 'zf2/master' into livedocx-2.0

zendframework · May 25, 2011 · e2703e7 · e2703e7
2 parents 716c7d5 + ea99bf1
commit e2703e7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Storage/Writable/Maildir.php b/src/Storage/Writable/Maildir.php
@@ -347,8 +347,8 @@ public function renameFolder($oldName, $newName)
     protected function _createUniqueId()
     {
         $id = '';
-        $id .= function_exists('microtime') ? microtime(true) : (time() . ' ' . rand(0, 100000));
-        $id .= '.' . (function_exists('posix_getpid') ? posix_getpid() : rand(50, 65535));
+        $id .= microtime(true);
+        $id .= '.' . getmypid();
         $id .= '.' . php_uname('n');
 
         return $id;