global used for two different things

3 files changed, 4 insertions, 15 deletions

diff --git a/admin_trees_renumber.php b/admin_trees_renumber.php
index eaf527bb5e..e1e53d1627 100644
--- a/admin_trees_renumber.php
+++ b/admin_trees_renumber.php
@@ -248,7 +248,7 @@ if (WT_Filter::get('go')) {
 		}
 
 		// How much time do we have left?
-		if (microtime(true) - $start_time > ini_get('max_execution_time') - 5) {
+		if (microtime(true) - WT_START_TIME > ini_get('max_execution_time') - 2) {
 			echo '<p>', WT_I18N::translate('The server’s time limit was reached.'), '</p>';
 			break;
 		}
diff --git a/includes/session.php b/includes/session.php
index 858e8f322a..9a2c1ebf38 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -33,7 +33,7 @@ if (!defined('WT_SCRIPT_NAME')) {
 
 // To embed webtrees code in other applications, we must explicitly declare any global variables that we create.
 // session.php
-global $start_time, $WT_REQUEST, $WT_SESSION, $WT_TREE, $GEDCOM, $SEARCH_SPIDER, $TEXT_DIRECTION;
+global $WT_REQUEST, $WT_SESSION, $WT_TREE, $GEDCOM, $SEARCH_SPIDER, $TEXT_DIRECTION;
 // most pages
 global $controller;
 
@@ -97,9 +97,6 @@ define('WT_THEMES_DIR', 'themes/' );
 define('WT_DEBUG', false);
 define('WT_DEBUG_SQL', false);
 
-// Error reporting
-define('WT_ERROR_LEVEL', 2); // 0=none, 1=minimal, 2=full
-
 // Required version of database tables/columns/indexes/etc.
 define('WT_SCHEMA_VERSION', 29);
 
@@ -152,7 +149,7 @@ define('WT_PRIV_HIDE', -1); // Hide the item to all users
 define('WT_ROOT', realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR);
 
 // Keep track of time statistics, for the summary in the footer
-$start_time = microtime(true);
+define('WT_START_TIME', microtime(true));
 
 // We want to know about all PHP errors
 error_reporting(E_ALL | E_STRICT);
@@ -299,9 +296,6 @@ require WT_ROOT . 'includes/functions/functions_import.php';
 // Set a custom error handler
 set_error_handler(function ($errno, $errstr) {
 	if (error_reporting() > 0 && $errno < 2048) {
-		if (WT_ERROR_LEVEL == 0) {
-			return false;
-		}
 		$fmt_msg = "<br>ERROR {$errno}: {$errstr}<br>";
 		$log_msg = "ERROR {$errno}: {$errstr};";
 		// Although debug_backtrace should always exist in PHP5, without this check, PHP sometimes crashes.
@@ -309,9 +303,6 @@ set_error_handler(function ($errno, $errstr) {
 		if ($errno < 16 && function_exists("debug_backtrace") && strstr($errstr, "headers already sent by") === false) {
 			$backtrace = debug_backtrace();
 			$num = count($backtrace);
-			if (WT_ERROR_LEVEL == 1) {
-				$num = 1;
-			}
 			for ($i = 0; $i < $num; $i++) {
 				if ($i === 0) {
 					$fmt_msg .= "0 Error occurred on ";
diff --git a/library/WT/Controller/Page.php b/library/WT/Controller/Page.php
index 2b0349d6c5..df81ce3dfc 100644
--- a/library/WT/Controller/Page.php
+++ b/library/WT/Controller/Page.php
@@ -136,8 +136,6 @@ class WT_Controller_Page extends WT_Controller_Base {
 	 * @return string
 	 */
 	protected function pageFooter() {
-		global $start_time;
-
 		return
 			Theme::theme()->footerContainer() .
 			$this->getJavascript() .
@@ -145,7 +143,7 @@ class WT_Controller_Page extends WT_Controller_Base {
 			'</body>' .
 			'</html>' . PHP_EOL .
 			'<!-- webtrees: ' . WT_VERSION . ' -->' .
-			'<!-- Execution time: ' . WT_I18N::number(microtime(true) - $start_time, 3) . ' seconds -->' .
+			'<!-- Execution time: ' . WT_I18N::number(microtime(true) - WT_START_TIME, 3) . ' seconds -->' .
 			'<!-- Memory: ' . WT_I18N::number(memory_get_peak_usage(true) / 1024) . ' KB -->' .
 			'<!-- SQL queries: ' . WT_I18N::number(WT_DB::getQueryCount()) . ' -->';
 	}