[phpwiki-checkins] SF.net SVN: phpwiki:[9369] trunk

[<var...@us...>]

Revision: 9369
          http://sourceforge.net/p/phpwiki/code/9369
Author:   vargenau
Date:     2014-11-24 14:49:45 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Revert r9177: function posix_times does not exist on Windows (reported by jdebert)

Revision Links:
--------------
    http://sourceforge.net/p/phpwiki/code/9177

Modified Paths:
--------------
    trunk/lib/prepend.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2014-11-23 20:18:22 UTC (rev 9368)
+++ trunk/lib/prepend.php	2014-11-24 14:49:45 UTC (rev 9369)
@@ -69,7 +69,10 @@
     function DebugTimer()
     {
         $this->_start = $this->microtime();
-        $this->_times = posix_times();
+        // Function 'posix_times' does not exist on Windows
+        if (function_exists('posix_times')) {
+            $this->_times = posix_times();
+        }
     }
 
     /**
@@ -96,6 +99,10 @@
 
     function getStats()
     {
+        if (!isset($this->_times)) {
+            // posix_times() not available.
+            return sprintf("real: %.3f", $this->getTime('real'));
+        }
         $now = posix_times();
         return sprintf("real: %.3f, user: %.3f, sys: %.3f",
             $this->getTime('real'),

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-11-23 20:18:22 UTC (rev 9368)
+++ trunk/pgsrc/ReleaseNotes	2014-11-24 14:49:45 UTC (rev 9369)
@@ -1,4 +1,4 @@
-Date: Fri, 21 Nov 2014 12:46:01 +0000
+Date: Mon, 24 Nov 2014 15:49:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -13,6 +13,7 @@
 * easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
 * improve handling of image insertion icon in edit toolbar (icon did not always appear after image uploading)
 * bigger wikipaging font
+* test again for function 'posix_times', it does not exist on Windows (reported by jdebert)
 * remove FPDF, lib/gif.php, lib/font (was not used)
 
 == 1.5.2 2014-10-10 Marc-Etienne Vargenau ==

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.