Merge branch 'master' of git://git.zendframework.com/zf

Conflicts: .gitignore
zendframework · Aug 20, 2011 · ceecda2 · ceecda2
10 parents 3787826 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f
commit ceecda2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 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;

diff --git a/tools/phptools b/tools/phptools