From 02f762831461233809c95189b1b4e9a647e22944 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 03 Sep 2014 07:01:38 -0400
Subject: [PATCH] Fix page title when using search filter (#1490023)
---
program/steps/mail/func.inc | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index a7c483b..25f2e31 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -79,6 +79,8 @@
if (!empty($_SESSION['search_scope']))
$OUTPUT->set_env('search_scope', $_SESSION['search_scope']);
+
+ rcmail_list_pagetitle();
}
$threading = (bool) $RCMAIL->storage->get_threading();
@@ -119,11 +121,6 @@
'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded',
'priority', 'withattachment', 'fileuploaderror');
}
-
- $pagetitle = $RCMAIL->localize_foldername($mbox_name, true);
- $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
-
- $OUTPUT->set_pagetitle($pagetitle);
}
// register UI objects
@@ -218,6 +215,26 @@
}
/**
+ * Sets page title
+ */
+function rcmail_list_pagetitle()
+{
+ global $RCMAIL;
+
+ if ($RCMAIL->output->get_env('search_request')) {
+ $pagetitle = $RCMAIL->gettext('searchresult');
+ }
+ else {
+ $mbox_name = $RCMAIL->storage->get_folder();
+ $delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
+ $pagetitle = $RCMAIL->localize_foldername($mbox_name, true);
+ $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
+ }
+
+ $RCMAIL->output->set_pagetitle($pagetitle);
+}
+
+/**
* Returns default search mods
*/
function rcmail_search_mods()
--
Gitblit v1.9.1