From 2392b22d046c1297df4e359df24f22da58db5f5b Mon Sep 17 00:00:00 2001
From: vbracco <vbracco@gmail.com>
Date: Fri, 20 Jul 2007 14:17:10 +0000
Subject: [PATCH] Delete config.php and update config-sample.php

---
 config-sample.php |  7 +++++--
 config.php        | 36 ------------------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 config.php

diff --git a/config-sample.php b/config-sample.php
index ad50487..148f2e1 100644
--- a/config-sample.php
+++ b/config-sample.php
@@ -17,7 +17,6 @@
 	define('DB_User', '[userdb]');				// Set the MySQL username
 	define('DB_Password', '[dbpass]'); 			// Set the MySQL password
 	define('Table_prefix', '[tableprefix]');	// Set the MySQL tables prefixes
-
 	/* Do not edit below this line */
 
 	define('Absolute_Path', dirname(__FILE__).DIRECTORY_SEPARATOR);	
@@ -28,5 +27,9 @@
 	header("Cache-Control: no-store, no-cache, must-revalidate");
 	header("Cache-Control: post-check=0, pre-check=0", false);
 	header("Pragma: no-cache");
-	require_once(Absolute_Path."classes".DIRECTORY_SEPARATOR."mysql_connection.class.php");
+	require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'mysql_connection.class.php');
+	require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'streams.class.php');
+	require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'gettext.class.php');
+	require_once(Absolute_Path.'classes'.DIRECTORY_SEPARATOR.'lang.functions.php');
+	initIdioma('en');
 ?>
\ No newline at end of file
diff --git a/config.php b/config.php
deleted file mode 100644
index 37d084e..0000000
--- a/config.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* ===========================
-
-  gelato CMS - A PHP based tumblelog CMS
-  development version
-  http://www.gelatocms.com/
-
-  gelato CMS is a free software licensed under GPL (General public license)
-
-  =========================== */
-?>
-<?php
-	// MySql configuration
-	define('DB_Server', 'localhost');			// Set the MySQL hostname (generally "localhost")
-	define('DB_name', 'gelato');			// Set the MySQL database gelato should use
-	define('DB_User', 'root');				// Set the MySQL username
-	define('DB_Password', 'pass'); 			// Set the MySQL password
-	define('Table_prefix', 'gel_');	// Set the MySQL tables prefixes
-
-	/* Do not edit below this line */
-
-	define('Absolute_Path', dirname(__FILE__).DIRECTORY_SEPARATOR);	
-	
-	session_start();
-	header("Expires: Mon, 26 Jul 1957 05:00:00 GMT");
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s ") . " GMT");
-	header("Cache-Control: no-store, no-cache, must-revalidate");
-	header("Cache-Control: post-check=0, pre-check=0", false);
-	header("Pragma: no-cache");
-	require_once(Absolute_Path."classes".DIRECTORY_SEPARATOR."mysql_connection.class.php");
-
-	require_once(dirname(__FILE__).'/classes/streams.php');
-	require_once(dirname(__FILE__).'/classes/gettext.php');
-	require_once(dirname(__FILE__)."/classes/lang.php");
-	initIdioma('en');
-?>
\ No newline at end of file