Skip to content

Commit

Permalink
Merge pull request #60 from cekdahl/master
Browse files Browse the repository at this point in the history
Fix issue with messages
  • Loading branch information
Emre Akay committed Sep 21, 2015
2 parents 6197957 + 54f8563 commit 902a248
Showing 1 changed file with 4 additions and 19 deletions.
23 changes: 4 additions & 19 deletions application/libraries/Aauth.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public function __construct() {
$this->aauth_db = $this->CI->load->database($this->config_vars['db_profile'], TRUE);

// load error and info messages from flashdata (but don't store back in flashdata)
$this->errors = $this->CI->session->flashdata('errors');
$this->infos = $this->CI->session->flashdata('infos');
$this->errors = $this->CI->session->flashdata('errors') ?: array();
$this->infos = $this->CI->session->flashdata('infos') ?: array();
}


Expand Down Expand Up @@ -1867,15 +1867,7 @@ public function keep_errors($include_non_flash = FALSE)
*/
public function get_errors_array()
{

if (!count($this->errors)==0)
{
return $this->errors;
}
else
{
return array();
}
return $this->errors;
}

/**
Expand Down Expand Up @@ -1962,14 +1954,7 @@ public function keep_infos($include_non_flash = FALSE)
*/
public function get_infos_array()
{
if (!count($this->infos)==0)
{
return $this->infos;
}
else
{
return array();
}
return $this->infos;
}


Expand Down

0 comments on commit 902a248

Please sign in to comment.