--- C:\Users\3ncrypt3d\Desktop\bugs\index.php	2011-03-29 05:53:57.230468700 +0530
+++ C:\Users\3ncrypt3d\Desktop\bugs\index1.php	2011-03-29 05:01:53.149414000 +0530
@@ -395,7 +395,9 @@
 			  AND ((a.expires >= '".date("Y-m-d H:i")."') OR (a.expires is null))
               AND ((a.startdate <= '".date("Y-m-d H:i")."') OR (a.startdate is null))
 			  ORDER BY surveyls_title";
-    $result = db_execute_assoc($query,false,true) or die("Could not connect to database. If you try to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
+    if($result = db_execute_assoc($query,false,true)){} 
+	else
+	header("Location:./admin/install");//Checked
     $list=array();
     if($result->RecordCount() > 0)
     {

398c398
<     $result = db_execute_assoc($query,false,true) or die("Could not connect to database. Trying to install Limesurvey? please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
---
>     $result = db_execute_assoc($query,false,true) or die("Could not connect to database. If you are trying to install Limesurvey please refer to the <a href='http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Run_the_installation_script'>installation docs</a>(in english) for this specific issue, for other languages check <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked

--- C:/Users/Admin/AppData/Local/Temp/index.php-revBASE.svn000.tmp.php	Fri Apr  8 09:44:53 2011
+++ C:/wamp/www/LS-stable/index.php	Fri Apr  8 09:40:55 2011
@@ -30,7 +30,16 @@
 $move=sanitize_paranoid_string(returnglobal('move'));
 $clienttoken=sanitize_token(returnglobal('token'));
 
+if (!$database_exists)
+{
+die("Unable to connect to database.<br />If you are trying to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage.");
+}
 
+if ($dbexistsbutempty)
+{
+die("No tables in database.<br />If you are trying to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage.");
+}
+
 if (!isset($thisstep))
 {
     $thisstep = "";

Index: common.php
===================================================================
--- common.php	(revision 9939)
+++ common.php	(working copy)
@@ -143,6 +143,11 @@
     $captchapath=$rooturl.'/';  
 }
 
+//check if databasename is set in config file
+if (!$databasename)
+{
+    die("Database Information not provided. If you try to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage.");
+}
 
 //BEFORE SESSIONCONTOL BECAUSE OF THE CONNECTION
 //CACHE DATA
@@ -223,8 +228,13 @@
 }
 
 
-// Check if the DB is up to date
-If ($dbexistsbutempty && $sourcefrom=='admin') {
+//check if database exist and access is not via install script
+if (!$database_exists && (strcasecmp($slashlesspath,str_replace(array("\\", "/"), "", $homedir."install")) != 0)) {
+    die ("<br/>The LimeSurvey database does not exist. Please run the <a href='$homeurl/install/index.php'>install script</a> to create the necessary database.");
+}
+ 
+ // Check if the DB is up to date
+if ($dbexistsbutempty && (strcasecmp($slashlesspath,str_replace(array("\\", "/"), "", $homedir."install")) != 0)) {
     die ("<br />The LimeSurvey database does exist but it seems to be empty. Please run the <a href='$homeurl/install/index.php'>install script</a> to create the necessary tables.");
 }