diff --git a/mozilla/tools/reporter/config-default.inc.php b/mozilla/tools/reporter/config-default.inc.php
index 556b492f31b..6a1c94b6491 100644
--- a/mozilla/tools/reporter/config-default.inc.php
+++ b/mozilla/tools/reporter/config-default.inc.php
@@ -128,6 +128,7 @@ $config['fields']['report_buildconfig'] = 'Build Config';
$config['fields']['report_platform'] = 'Platform';
$config['fields']['report_oscpu'] = 'OSCPU';
$config['fields']['report_language'] = 'Language';
+$config['fields']['report_charset'] = 'Charset';
$config['fields']['report_file_date'] = 'File Date';
$config['fields']['report_email'] = 'Email';
$config['fields']['report_ip'] = 'IP';
diff --git a/mozilla/tools/reporter/htdocs/report.php b/mozilla/tools/reporter/htdocs/report.php
index 25e25f24152..303823c97fe 100644
--- a/mozilla/tools/reporter/htdocs/report.php
+++ b/mozilla/tools/reporter/htdocs/report.php
@@ -109,6 +109,7 @@ $content->assign('report_buildconfig', $reportQuery->fields['report_buildcon
$content->assign('report_platform', $reportQuery->fields['report_platform']);
$content->assign('report_oscpu', $reportQuery->fields['report_oscpu']);
$content->assign('report_language', $reportQuery->fields['report_language']);
+$content->assign('report_charset', $reportQuery->fields['report_charset']);
$content->assign('report_file_date', $reportQuery->fields['report_file_date']);
$content->assign('report_email', $reportQuery->fields['report_email']);
$content->assign('report_ip', $reportQuery->fields['report_ip']);
diff --git a/mozilla/tools/reporter/includes/query.inc.php b/mozilla/tools/reporter/includes/query.inc.php
index cb3e57b4e22..28f8b585475 100644
--- a/mozilla/tools/reporter/includes/query.inc.php
+++ b/mozilla/tools/reporter/includes/query.inc.php
@@ -18,6 +18,7 @@ class query
'report_id',
'report_buildconfig',
'report_description',
+ 'report_charset',
/* 'report_email',
'report_ip',
*/ 'report_host_id',
@@ -38,7 +39,8 @@ class query
'report_gecko',
'report_buildconfig',
'report_product',
- 'report_file_date'
+ 'report_file_date',
+ 'report_charset'
);
var $orderbyChecked = false; // If we are ordering, used by continuity params
@@ -283,7 +285,7 @@ class query
$sql_where = 'WHERE ';
$host_join_str = 'host.host_id = report_host_id AND '; // this is a var to help them remain consistant for when it's deleted
-
+
$sql_where .= $host_join_str;
foreach($this->where as $where_child){
diff --git a/mozilla/tools/reporter/sql/schema.sql b/mozilla/tools/reporter/sql/schema.sql
index ef4f76c58fd..4a9e4c298a8 100644
--- a/mozilla/tools/reporter/sql/schema.sql
+++ b/mozilla/tools/reporter/sql/schema.sql
@@ -45,6 +45,7 @@ CREATE TABLE "report" (
"report_problem_type" varchar(5) collate utf8_unicode_ci NOT NULL default '0',
"report_description" text collate utf8_unicode_ci NOT NULL,
"report_behind_login" int(11) NOT NULL default '0',
+ "report_charset" varchar(25) collate utf8_unicode_ci NOT NULL default '',
"report_useragent" varchar(255) collate utf8_unicode_ci NOT NULL default '',
"report_platform" varchar(20) collate utf8_unicode_ci NOT NULL default '',
"report_oscpu" varchar(100) collate utf8_unicode_ci NOT NULL default '',
diff --git a/mozilla/tools/reporter/templates/report.tpl b/mozilla/tools/reporter/templates/report.tpl
index ebfaf3d4bfe..a63ec60b689 100644
--- a/mozilla/tools/reporter/templates/report.tpl
+++ b/mozilla/tools/reporter/templates/report.tpl
@@ -77,6 +77,10 @@ function show(aItem){
Language:
{$report_language}
+
+
Character Set:
+
{$report_charset}
+
User Agent:
{$report_useragent}