From e45ccd3a84570863d69574eb16b34fb66b58dc6e Mon Sep 17 00:00:00 2001 From: REJack Date: Sun, 9 Dec 2018 22:23:32 +0100 Subject: [PATCH] updated Libraries/Aauth, Aauth/ErrorsTest & Aauth/InfosTest --- application/Libraries/Aauth.php | 3 +-- tests/Aauth/Libraries/Aauth/ErrorsTest.php | 1 + tests/Aauth/Libraries/Aauth/InfosTest.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/Libraries/Aauth.php b/application/Libraries/Aauth.php index 5d5d9b7..1d7bca9 100644 --- a/application/Libraries/Aauth.php +++ b/application/Libraries/Aauth.php @@ -1051,8 +1051,7 @@ class Aauth { if ($includeNonFlash) { - $this->flashInfos = array_merge($this->flashInfos, $this->infos); - $this->flashInfos = array_merge($this->session->getFlashdata('infos'), $this->errors); + $this->flashInfos = array_merge($this->session->getFlashdata('infos'), $this->infos); $this->session->setFlashdata('infos', $this->flashInfos); } else diff --git a/tests/Aauth/Libraries/Aauth/ErrorsTest.php b/tests/Aauth/Libraries/Aauth/ErrorsTest.php index a405473..1f93bcb 100644 --- a/tests/Aauth/Libraries/Aauth/ErrorsTest.php +++ b/tests/Aauth/Libraries/Aauth/ErrorsTest.php @@ -123,6 +123,7 @@ class ErrorsTest extends \CIUnitTestCase $this->assertNull($session->getFlashdata('errors')); $this->library->error('test message 1 Flash', true); $session->start(); + $this->library = new Aauth(NULL, $session); $this->library->error('test message 1 NonFlash'); $this->library->keepErrors(true); $session->start(); diff --git a/tests/Aauth/Libraries/Aauth/InfosTest.php b/tests/Aauth/Libraries/Aauth/InfosTest.php index d095e38..434aa84 100644 --- a/tests/Aauth/Libraries/Aauth/InfosTest.php +++ b/tests/Aauth/Libraries/Aauth/InfosTest.php @@ -123,6 +123,7 @@ class InfosTest extends \CIUnitTestCase $this->assertNull($session->getFlashdata('infos')); $this->library->info('test message 1 Flash', true); $session->start(); + $this->library = new Aauth(NULL, $session); $this->library->info('test message 1 NonFlash'); $this->library->keepInfos(true); $session->start();