From 7b0aa16dab449f07858b7b17784e5921e43a8552 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 12 Oct 2015 15:03:56 -0500
Subject: [PATCH] Fix message on My Certificates and Search Certificates page -
 refs #7879

---
 main/gradebook/my_certificates.php | 13 ++++++-------
 main/gradebook/search.php          | 17 ++++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/main/gradebook/my_certificates.php b/main/gradebook/my_certificates.php
index 609b60ddd4..c037eae5c0 100644
--- a/main/gradebook/my_certificates.php
+++ b/main/gradebook/my_certificates.php
@@ -19,19 +19,18 @@ $userId = api_get_user_id();
 $courseList = GradebookUtils::getUserCertificatesInCourses($userId);
 $sessionList = GradebookUtils::getUserCertificatesInSessions($userId);
 
+if (empty($courseList) && empty($sessionList)) {
+    Display::addFlash(
+        Display::return_message(get_lang('YouNotYetAchievedCertificates'), 'warning')
+    );
+}
+
 $template = new Template(get_lang('MyCertificates'));
 
 $template->assign('course_list', $courseList);
 $template->assign('session_list', $sessionList);
 $content = $template->fetch('default/gradebook/my_certificates.tpl');
 
-if (empty($courseList) || empty($sessionList)) {
-    $template->assign(
-        'message',
-        Display::return_message(get_lang('YouNotYetAchievedCertificates'), 'warning')
-    );
-}
-
 if (api_get_setting('allow_public_certificates') == 'true') {
     $template->assign(
         'actions',
diff --git a/main/gradebook/search.php b/main/gradebook/search.php
index 97282e07e2..4a3b70096e 100644
--- a/main/gradebook/search.php
+++ b/main/gradebook/search.php
@@ -35,7 +35,9 @@ if ($searchForm->validate()) {
     $userList = UserManager::getUserByName($firstname, $lastname);
 
     if (empty($userList)) {
-        Session::write('message', Display::return_message(get_lang('NoResults'), 'warning'));
+        Display::addFlash(
+            Display::return_message(get_lang('NoResults'), 'warning')
+        );
 
         header('Location: '.api_get_self());
         exit;
@@ -44,7 +46,10 @@ if ($searchForm->validate()) {
     $userInfo = api_get_user_info($userId);
 
     if (empty($userInfo)) {
-        Session::write('message', Display::return_message(get_lang('NoUser'), 'warning'));
+        Display::addFlash(
+            Display::return_message(get_lang('NoUser'), 'warning')
+        );
+
         header('Location: '.api_get_self());
         exit;
     }
@@ -53,8 +58,7 @@ if ($searchForm->validate()) {
     $sessionList = GradebookUtils::getUserCertificatesInSessions($userId, false);
 
     if (empty($courseList) && empty($sessionList)) {
-        Session::write(
-            'message',
+        Display::addFlash(
             Display::return_message(
                 sprintf(get_lang('TheUserXNotYetAchievedCertificates'), $userInfo['complete_name']),
                 'warning'
@@ -74,11 +78,6 @@ $template->assign('user_info', $userInfo);
 $template->assign('course_list', $courseList);
 $template->assign('session_list', $sessionList);
 
-if (Session::has('message')) {
-    $template->assign('message', Session::read('message'));
-    Session::erase('message');
-}
-
 $content = $template->fetch('default/gradebook/search.tpl');
 
 $template->assign('header', get_lang('SearchCertificates'));