From aa27a22f7ca12caa89e6ccddf7c399cb619ab49d Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 29 Aug 2013 08:17:32 +1000
Subject: wtf? duplicate code

---
 inc/functions.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index e2289ef1..c0cf47b1 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1776,12 +1776,6 @@ function buildThread($id, $return = false, $mod = false) {
 		$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
 		file_write($jsonFilename, $json);
 	}
-
-	if ($return) {
-		return $body;
-	} else {
-		file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $id), $body);
-	}
 }
 
 function rrmdir($dir) {
-- 
cgit v1.3


From 3fbd05173713f281fb89247f750ba2cad7ae6253 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 29 Aug 2013 08:25:15 +1000
Subject: Record time started (in milliseconds) at the very beginning of
 inc/functions.php, even when $config['debug'] is disabled (because we can't
 tell, yet). Gets a more accurate time for page generation.

---
 inc/functions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index c0cf47b1..236e5199 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -9,6 +9,8 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
 	exit;
 }
 
+$microtime_start = microtime(true);
+
 require_once 'inc/display.php';
 require_once 'inc/template.php';
 require_once 'inc/database.php';
@@ -24,7 +26,7 @@ mb_internal_encoding('UTF-8');
 loadConfig();
 
 function loadConfig() {
-	global $board, $config, $__ip, $debug, $__version;
+	global $board, $config, $__ip, $debug, $__version, $microtime_start;
 
 	$error = function_exists('error') ? 'error' : 'basic_error_function_because_the_other_isnt_loaded_yet';
 
@@ -82,7 +84,7 @@ function loadConfig() {
 	if ($config['debug']) {
 		if (!isset($debug)) {
 			$debug = array('sql' => array(), 'exec' => array(), 'purge' => array(), 'cached' => array(), 'write' => array());
-			$debug['start'] = microtime(true);
+			$debug['start'] = $microtime_start;
 		}
 	}
 
-- 
cgit v1.3


From 82577738072a833aa0ec8ed6e798d684d1abea1d Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 29 Aug 2013 08:30:21 +1000
Subject: $config['debug']: Show time initializing Tinyboard (before $debug was
 created)

---
 inc/functions.php | 1 +
 inc/template.php  | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index 236e5199..ec37a617 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -85,6 +85,7 @@ function loadConfig() {
 		if (!isset($debug)) {
 			$debug = array('sql' => array(), 'exec' => array(), 'purge' => array(), 'cached' => array(), 'write' => array());
 			$debug['start'] = $microtime_start;
+			$debug['start_debug'] = microtime(true);;
 		}
 	}
 
diff --git a/inc/template.php b/inc/template.php
index ef688944..6f85e78b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -47,7 +47,9 @@ function Element($templateFile, array $options) {
 	if (isset($options['body']) && $config['debug']) {
 		if (isset($debug['start'])) {
 			$debug['time'] = '~' . round((microtime(true) - $debug['start']) * 1000, 2) . 'ms';
+			$debug['time (initialization)'] = '~' . round(($debug['start_debug'] - $debug['start']) * 1000, 2) . 'ms';
 			unset($debug['start']);
+			unset($debug['start_debug']);
 		}
 		$debug['included'] = get_included_files();
 		$debug['memory'] = round(memory_get_usage(true) / (1024 * 1024), 2) . ' MiB';
-- 
cgit v1.3


From 90eb8f1f3765afc848f7a3f7f12d83a46fe9e92f Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 29 Aug 2013 08:41:36 +1000
Subject: redundant ORDER BY

---
 inc/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index ec37a617..1bd185a9 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -647,7 +647,7 @@ function checkBan($board = 0) {
 	if (event('check-ban', $board))
 		return true;
 
-	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, ``bans``.`id` FROM ``bans`` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC, `expires` DESC LIMIT 1");
+	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, ``bans``.`id` FROM ``bans`` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC LIMIT 1");
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':board', $board);
 	$query->execute() or error(db_error($query));
-- 
cgit v1.3