Commit d555f507 by Tobin

Merge branch 'master' into 'production'

dc See merge request !29
parents 4ed0b71f 0677b885
......@@ -86,7 +86,7 @@ class Ride extends CI_Controller {
if(empty($importData) || !isset($importData['status']) || $importData['status'] == 3 ||
$importData['status'] == 4 || ($importData['status'] == 1 && empty($importData['headerArr']))){
$this->session->set_flashdata('message',$flashMsg);
$this->session->set_flashdata('message',array('message'=>'Uploaded File Not Compatible','class'=>'error'));
redirect(base_url('Ride/import_ride'));
}
if ($importData['status'] == 2){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment