Browse Source

A couple of small broken things + removed utf8_should_work from install.php

Signed-off-by: emanuele <[email protected]>
emanuele 12 years ago
parent
commit
5cf00b8e5c
3 changed files with 4 additions and 10 deletions
  1. 1 1
      Themes/default/Settings.template.php
  2. 2 8
      other/install.php
  3. 1 1
      other/install_2-1_mysql.sql

+ 1 - 1
Themes/default/Settings.template.php

@@ -130,7 +130,7 @@ function template_options()
 			'options' => array(
 				0 => $txt['display_quick_reply1'],
 				1 => $txt['display_quick_reply2'],
-				2 => $txt['display_quick_reply3']
+				2 => $txt['display_quick_reply3'],
 				3 => $txt['display_quick_reply4']
 			),
 			'default' => true,

+ 2 - 8
other/install.php

@@ -912,7 +912,6 @@ function ForumSettings()
 
 	// Check if the database sessions will even work.
 	$incontext['test_dbsession'] = ini_get('session.auto_start') != 1;
-	$incontext['utf8_should_work'] = stripos(PHP_OS, 'win') === false;
 	$incontext['utf8_default'] = $databases[$db_type]['utf8_default'];
 	$incontext['utf8_required'] = $databases[$db_type]['utf8_required'];
 
@@ -2437,19 +2436,14 @@ function template_forum_settings()
 					<input type="checkbox" name="dbsession" id="dbsession_check" checked="checked" class="input_check" /> <label for="dbsession_check">', $txt['install_settings_dbsession_title'], '</label><br />
 					<div style="font-size: smaller; margin-bottom: 2ex;">', $incontext['test_dbsession'] ? $txt['install_settings_dbsession_info1'] : $txt['install_settings_dbsession_info2'], '</div>
 				</td>
-			</tr>';
-
-	if ($incontext['utf8_should_work'])
-		echo '
+			</tr>
 			<tr>
 				<td valign="top" class="textbox">', $txt['install_settings_utf8'], ':</td>
 				<td>
 					<input type="checkbox" name="utf8" id="utf8_check"', $incontext['utf8_default'] ? ' checked="checked"' : '', ' class="input_check"', $incontext['utf8_required'] ? ' disabled="disabled"' : '', ' /> <label for="utf8_check">', $txt['install_settings_utf8_title'], '</label><br />
 					<div style="font-size: smaller; margin-bottom: 2ex;">', $txt['install_settings_utf8_info'], '</div>
 				</td>
-			</tr>';
-
-	echo '
+			</tr>
 			<tr>
 				<td valign="top" class="textbox">', $txt['install_settings_stats'], ':</td>
 				<td>

+ 1 - 1
other/install_2-1_mysql.sql

@@ -989,7 +989,7 @@ CREATE TABLE {$db_prefix}log_reported (
   id_member mediumint(8) unsigned NOT NULL default '0',
   membername varchar(255) NOT NULL default '',
   subject varchar(255) NOT NULL default '',
-  body text NOT NULL,
+  body mediumtext NOT NULL,
   time_started int(10) NOT NULL default '0',
   time_updated int(10) NOT NULL default '0',
   num_reports mediumint(6) NOT NULL default '0',