3 files changed, 38 insertions, 5 deletions
diff --git a/admin/popuphelp.php b/admin/popuphelp.php
index 8c431c88b..7d0a0cf8b 100644
--- a/admin/popuphelp.php
+++ b/admin/popuphelp.php
@@ -47,16 +47,21 @@ if
     and preg_match('/^[a-z_]*$/', $_GET['page'])
   )
 {
-  $help_content =
-    load_language('help/'.$_GET['page'].'.html', '', array('return'=>true) );
+  $help_content = load_language(
+    'help/'.$_GET['page'].'.html',
+    '',
+    array(
+      'force_fallback' => 'en_UK',
+      'return' => true,
+      )
+    );
 
   if ($help_content == false)
   {
     $help_content = '';
   }
 
-  $help_content = trigger_change(
-    'get_popup_help_content', $help_content, $_GET['page']);
+  $help_content = trigger_change('get_popup_help_content', $help_content, $_GET['page']);
 }
 else
 {
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 1e644f585..a483a0485 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1242,4 +1242,28 @@ a.group_perm {
 }
 .preview-box.icon-search:hover img {
   opacity:0.5;
-}
-\ No newline at end of file
+}
+
+/* table in help/quick_search.html */
+table.qsearch_help_table {
+  border-collapse:collapse;
+  text-align:left;
+  margin:1em;
+}
+table.qsearch_help_table q {
+	font-family: Courier, Fixed;
+	font-weight: bold;
+}
+table.qsearch_help_table q:before {
+	content: '\'';
+	color: green;
+}
+table.qsearch_help_table q:after {
+	content: '\'';
+	color: green;
+}
+table.qsearch_help_table td {
+	border: 1px solid #ccc;
+  padding:5px;
+  vertical-align:top;
+}
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index c543981f4..088d18912 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -353,3 +353,7 @@ table.dataTable thead th {
 
 .userPropertiesContainer {border-color:#333;}
 .userPrefs {border-color:#333;}
+
+table.qsearch_help_table td {
+	border-color: #444;
+}
+\ No newline at end of file