Merge pull request #471 from eurich/master

installer fixes
elkarte · May 28, 2013 · 7645216 · 7645216
2 parents 73cb24b + ad2e615
commit 7645216
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/install/install.php b/install/install.php
@@ -2330,12 +2330,7 @@ function template_database_settings()
 					<div style="font-size: smaller; margin-bottom: 2ex;">', $txt['db_settings_database_info'], '
 					<span id="db_name_info_warning">', $txt['db_settings_database_info_note'], '</span></div>
 				</td>
-			</tr><tr id="db_filename_contain" style="display: none;">
-				<td style="vertical-align:top" class="textbox"><label for="db_filename_input">', $txt['db_settings_database_file'], ':</label></td>
-				<td>
-					<input type="text" name="db_filename" id="db_filename_input" value="', empty($incontext['db']['name']) ? dirname(__FILE__) . '/elkarte_' . substr(md5(microtime()), 0, 10) : stripslashes($incontext['db']['name']), '" size="30" class="input_text" /><br />
-					<div style="font-size: smaller; margin-bottom: 2ex;">', $txt['db_settings_database_file_info'], '</div>
-				</td>
+			</tr>
 			</tr><tr>
 				<td style="vertical-align:top" class="textbox"><label for="db_prefix_input">', $txt['db_settings_prefix'], ':</label></td>
 				<td>
@@ -2348,30 +2343,14 @@ function template_database_settings()
 	// Allow the toggling of input boxes for SQLite etc.
 	echo '
 	<script type="text/javascript"><!-- // --><![CDATA[
-		function toggleDBInput()
+		function validatePgsql()
 		{
-			// What state is it?';
-
-	if (count($incontext['supported_databases']) < 2)
-		echo '
-			var showAll = false;';
-	// If we have more than one DB, what should we be doing?
-	else
-		echo '
-			var showAll = true;';
-
-	echo '
-			document.getElementById(\'db_passwd_contain\').style.display = showAll ? \'\' : \'none\';
-			document.getElementById(\'db_server_contain\').style.display = showAll ? \'\' : \'none\';
-			document.getElementById(\'db_user_contain\').style.display = showAll ? \'\' : \'none\';
-			document.getElementById(\'db_name_contain\').style.display = showAll ? \'\' : \'none\';
-			document.getElementById(\'db_filename_contain\').style.display = !showAll ? \'\' : \'none\';
 			if (document.getElementById(\'db_type_input\').value == \'postgresql\')
 				document.getElementById(\'db_name_info_warning\').style.display = \'none\';
 			else
 				document.getElementById(\'db_name_info_warning\').style.display = \'\';
 		}
-		toggleDBInput();
+		validatePgsql();
 	// ]]></script>';
 }
 

diff --git a/install/install_1-0_mysql.sql b/install/install_1-0_mysql.sql
@@ -38,8 +38,8 @@ VALUES
 
 CREATE TABLE {$db_prefix}antispam_questions (
   id_question tinyint(4) unsigned NOT NULL auto_increment,
-  question text NOT NULL default '',
-  answer text NOT NULL default '',
+  question text NOT NULL,
+  answer text NOT NULL,
   language varchar(50) NOT NULL default '',
   PRIMARY KEY (id_question),
   KEY language (language(30))
@@ -2164,7 +2164,7 @@ CREATE TABLE {$db_prefix}postby_emails_error (
 	id_board smallint(5) NOT NULL default '0',
 	email_from varchar(50) NOT NULL default '',
 	message_type char(10) NOT NULL default '',
-	message mediumtext NOT NULL default '',
+	message mediumtext NOT NULL,
 	PRIMARY KEY (id_email)
 ) ENGINE=MyISAM;