From 66d94a0790fb96e85debe5809d5ad48f0f27f798 Mon Sep 17 00:00:00 2001
From: oilyflutesalad <oilyflutesalad@ispconfig3>
Date: Sat, 16 Jan 2010 11:22:13 -0500
Subject: [PATCH] Fixed: Server uptime minutes will always be two digits as a clock would show (eg 10:03 hours instead of 10:3 hours)

---
 install/tpl/config.inc.php.master |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index b38390c..1935b9a 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -39,8 +39,8 @@
 	ini_set('register_globals',0);
 	ini_set('magic_quotes_gpc', 0);
 	
-	if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-		die('Internal Error: GLOBALS override attempt detected');
+	if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
+		die('Internal Error: var override attempt detected');
 		exit;
 	}
 }
@@ -57,7 +57,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.9');
+define('ISPC_APP_VERSION', '3.0.1.5');
 
 
 //** Database
@@ -133,7 +133,7 @@
 
 
 //** Default Language
-$conf["language"] = 'en';
+$conf["language"] = '{language}';
 
 
 //** Misc.

--
Gitblit v1.9.1