From 2b88e6cf95044fa2e0704fc389b45164e420949e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 27 May 2016 11:55:38 +0200
Subject: [PATCH] Use $OUTPUT->set_env(...) instead of
 $OUTPUT->command('set_env', ...)

---
 program/steps/addressbook/search.inc   | 10 +++++-----
 program/steps/mail/search_contacts.inc |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index f16abd78c..afd11f89a 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -229,13 +229,13 @@ function rcmail_contact_search()
     }
 
     // update message count display
-    $OUTPUT->command('set_env', 'search_request', $search_request);
-    $OUTPUT->command('set_env', 'pagecount', ceil($result->count / $PAGE_SIZE));
+    $OUTPUT->set_env('search_request', $search_request);
+    $OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
     $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
     // Re-set current source
-    $OUTPUT->command('set_env', 'search_id', $sid);
-    $OUTPUT->command('set_env', 'source', '');
-    $OUTPUT->command('set_env', 'group', '');
+    $OUTPUT->set_env('search_id', $sid);
+    $OUTPUT->set_env('source', '');
+    $OUTPUT->set_env('group', '');
 
     if (!$sid) {
         // unselect currently selected directory/group
diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc
index 12066a99d..453ab1793 100644
--- a/program/steps/mail/search_contacts.inc
+++ b/program/steps/mail/search_contacts.inc
@@ -102,8 +102,8 @@ if (!empty($result) && $result->count > 0) {
 
     $OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));
 
-    $OUTPUT->command('set_env', 'search_request', $search_request);
-    $OUTPUT->command('set_env', 'source', '');
+    $OUTPUT->set_env('search_request', $search_request);
+    $OUTPUT->set_env('source', '');
     $OUTPUT->command('unselect_directory');
 }
 else if (!$group_count) {