Display results on items page..see previous commit

Author: Bitwasp

application/controllers/admin.php

@@ -833,7 +833,7 @@ public function delete_item($hash) {
 				$message = $this->bw_messages->prepare_input($info, $details);
 				$this->messages_model->send($message);
 
-				$this->session->flashdata('returnMessage',json_encode('message','The selected item has been removed'));
+				$this->session->set_flashdata('returnMessage',json_encode(array('message' =>'The selected item has been removed')));
 				redirect('items');
 			} else { 
 				$data['returnMessage'] = 'Unable to delete that item at this time.';

application/controllers/items.php

@@ -36,6 +36,10 @@ public function index($page = 0) {
 		$data['title'] = 'Items';
 		$data['page'] = 'items/index';
 
+		$info = (array)json_decode($this->session->flashdata('returnMessage'));
+		if(count($info) !== 0)
+			$data['returnMessage'] = $info['message'];		
+		
 		$items_config = array();
 		$items_per_page = 4;
 		$data['links'] = $this->items_model->pagination_links($items_config, site_url('items'), 2);
@@ -61,9 +65,6 @@ public function category($hash, $page = 0) {
 		if($data['category'] == FALSE)
 			redirect('items');
 
-		$info = (array)json_decode($this->session->flashdata('returnMessage'));
-		if(count($info) !== 0)
-			$data['returnMessage'] = $info['message'];			
 
 		$data['title'] = 'Items by Category: '.$data['category']['name'];
 		$data['custom_title'] = 'Category: '.$data['category']['name'];

version.ini

@@ -1 +1 @@
-bitwasp_created_time=1393865117
+bitwasp_created_time=1393865418