Commit: ef68cad8863f2269dfeb27eacb1c631abb8e28c7 - pukiwiki_auth (git)

Commit MetaInfo

• Revision: ef68cad8863f2269dfeb27eacb1c631abb8e28c7 (tree)
• Time: 2014-11-30 07:42:41
• Author: henoheno <henoheno>
• Commiter: umorigu

Log Message

BugTrack2/251: Show more decent 'HTML convert time' (base patched by ioio)

Change Summary

• modified: lib/func.php
• modified: lib/html.php
• modified: skin/pukiwiki.skin.php
• modified: skin/tdiary.skin.php

Incremental Difference

--- a/lib/func.php
+++ b/lib/func.php
@@ -476,6 +476,14 @@ function getmicrotime()
 	return ((float)$sec + (float)$usec);
 }
 
+// Elapsed time by second
+//define('MUTIME', getmicrotime());
+function elapsedtime()
+{
+	$at_the_microtime = MUTIME;
+	return sprintf('%01.03f', getmicrotime() - $at_the_microtime);
+}
+
 // Get the date
 function get_date($format, $timestamp = NULL)
 {

--- a/lib/html.php
+++ b/lib/html.php
@@ -146,8 +146,8 @@ function catbody($title, $page, $body)
 		}
 	}
 
-	$longtaketime = getmicrotime() - MUTIME;
-	$taketime     = sprintf('%01.03f', $longtaketime);
+	// Compat: 'HTML convert time' without time about MenuBar and skin
+	$taketime = elapsedtime();
 
 	require(SKIN_FILE);
 }

--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: pukiwiki.skin.php,v 1.52 2007/02/11 05:53:31 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.53 2007/06/24 13:59:50 henoheno Exp $
 // Copyright (C)
 //   2002-2006 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -271,7 +271,7 @@ function _toolbar($key, $x = 20, $y = 20){
 <div id="footer">
  Site admin: <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><p />
  <?php echo S_COPYRIGHT ?>.
- Powered by PHP <?php echo PHP_VERSION ?>. HTML convert time: <?php echo $taketime ?> sec.
+ Powered by PHP <?php echo PHP_VERSION ?>. HTML convert time: <?php echo elapsedtime() ?> sec.
 </div>
 
 </body>

--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -902,7 +902,7 @@ function _toolbar($key, $x = 20, $y = 20){
  Site admin: <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><p />
  <?php echo S_COPYRIGHT ?>.
  Powered by PHP <?php echo PHP_VERSION ?><br />
- HTML convert time: <?php echo $taketime ?> sec.
+ HTML convert time: <?php echo elapsedtime() ?> sec.
 
 </div><!-- class="footer" -->